fix: Run data-seed as separate step from reset

Author: adskyiproger

.github/workflows/k8s-reset-data.yml

@@ -1,5 +1,5 @@
 name: Reset environment
-run-name: "Reset ${{ inputs.environment }} environment"
+run-name: "Reset ${{ inputs.environment }} by ${{ github.actor }}"
 on:
   workflow_dispatch:
     inputs:
@@ -86,8 +86,6 @@ jobs:
           - postgres-data-migration
           - postgres-on-update-analytics
           - data-migration
-          - data-seed
-          - elasticsearch-reindex
     steps:
         - name: Download helm release values file into /tmp/opencrvs-${{ inputs.environment }}.json
           uses: actions/download-artifact@v5

.github/workflows/k8s-seed-data.yml

@@ -1,5 +1,5 @@
-name: Seed data
-run-name: "Seed data to ${{ inputs.environment }} environment"
+name: Seed environment
+run-name: "Seed ${{ inputs.environment }} by ${{ github.actor }}"
 on:
   workflow_dispatch:
     inputs:
@@ -32,9 +32,10 @@ jobs:
             Please approve or deny ${{ inputs.environment }} environment seeding
             initiated from GitHub Actions by @${{ github.actor }}.
           exclude-workflow-initiator-as-approver: false
-
-  seed:
+  prepare:
     needs: approve
+    outputs:
+      values-file: ${{ steps.get-values.outputs.values-file }}
     env:
       namespace: opencrvs-${{ inputs.environment }}
     runs-on:
@@ -43,41 +44,70 @@ jobs:
       - ${{ inputs.environment }}
     steps:
       - name: Get helm release values and Quote specific fields that are commonly numeric
+        id: get-values
         run: |
           helm get values opencrvs -n ${namespace} -ojson | \
             jq '
-              # Quote image tags
               if has("image") and (.image | has("tag")) and (.image.tag | type == "number") then
                 .image.tag = (.image.tag | tostring)
               else . end |
-              # Quote version numbers
               if has("version") and (.version | type == "number") then
                 .version = (.version | tostring)
               else . end |
-              # Quote port numbers if needed (optional)
               if has("service") and (.service | has("port")) and (.service.port | type == "number") then
                 .service.port = (.service.port | tostring)
               else . end
-            ' > ${namespace}.json
-      - name: Seeding data
-        run: |
-          kubectl delete job -n ${namespace} --ignore-not-found=true data-seed
-          helm template -f ${namespace}.json \
-              --set data_seed.enabled=true \
-              --namespace ${namespace} \
-              -s templates/data-seed-job.yaml \
-              oci://ghcr.io/opencrvs/opencrvs-services | kubectl apply --wait -n ${namespace} -f -
-      - name: Checking data-seed job status
-        run: |
-          while true; do
-            kubectl wait --for=condition=ready pod -ljob-name=data-seed --timeout=300s -n ${namespace} && \
-            kubectl logs job/data-seed --all-containers -f -n ${namespace} && \
-            touch /tmp/logs_stramed-${namespace}-data-seed.txt  || break;
-            sleep 10; done &
-          echo "---------------------- Waiting for job completion ----------------------"
-          kubectl wait --for=condition=complete job/data-seed -n ${namespace} --timeout=600s; status=$? || true
-          [ $status -ne 0 ] && kubectl get pods -n ${namespace} --show-labels && kubectl describe pod -ljob-name=${job_name} -n ${namespace};
-          [ ! -f /tmp/logs_stramed-${namespace}-data-seed.txt ] && kubectl logs job/data-seed --all-containers -n ${namespace} || \
-            rm -vf /tmp/logs_stramed-${namespace}-data-seed.txt
-          kill %1 2>/dev/null && echo "Stopped log streaming" || true
-          exit $status
+            ' > /tmp/${namespace}.json
+            echo "values-file=/tmp/${namespace}.json" >> $GITHUB_OUTPUT
+
+      - name: Upload helm release values file /tmp/opencrvs-${{ inputs.environment }}.json
+        uses: actions/upload-artifact@v4
+        with:
+          name: opencrvs-${{ inputs.environment }}-values-file
+          path: /tmp/opencrvs-${{ inputs.environment }}.json
+          retention-days: 1
+  seed:
+    name: ${{ matrix.job-name }}
+    needs: prepare
+    env:
+      namespace: opencrvs-${{ inputs.environment }}
+    runs-on:
+      - self-hosted
+      - k8s
+      - ${{ inputs.environment }}
+    strategy:
+      max-parallel: 1  # Ensure jobs run one by one
+      fail-fast: true  # Stop on first failure
+      matrix:
+        job-name:
+          - data-seed
+          - elasticsearch-reindex
+    steps:
+        - name: Download helm release values file into /tmp/opencrvs-${{ inputs.environment }}.json
+          uses: actions/download-artifact@v5
+          with:
+            name: opencrvs-${{ inputs.environment }}-values-file
+            path: /tmp
+        - name: Create job ${{ matrix.job-name }} from helm template and apply it
+          run: |
+            kubectl delete job -n ${namespace} --ignore-not-found=true ${{ matrix.job-name }}
+            helm template -f ${{ needs.prepare.outputs.values-file }} \
+                --set data_cleanup.enabled=true \
+                --set data_seed.enabled=true \
+                --namespace ${namespace} \
+                -s templates/${{ matrix.job-name }}-job.yaml \
+                oci://ghcr.io/opencrvs/opencrvs-services | kubectl apply -n ${namespace} --wait=true -f -
+        - name: Checking ${{ matrix.job-name }} job status
+          run: |
+            while true; do
+              kubectl wait --for=condition=ready pod -ljob-name=${{ matrix.job-name }} --timeout=300s -n ${namespace} && \
+              kubectl logs job/${{ matrix.job-name }} --all-containers -f -n ${namespace} && \
+              touch /tmp/logs_stramed-${namespace}-${{ matrix.job-name }}.txt || break; 
+              sleep 1; done &
+            echo "---------------------- Waiting for job completion ----------------------"
+            kubectl wait --for=condition=complete job/${{ matrix.job-name }} -n ${namespace} --timeout=600s; status=$? || true
+            [ $status -ne 0 ] && kubectl get pods -n ${namespace} --show-labels && kubectl describe pod -ljob-name=${job_name} -n ${namespace};
+            [ ! -f /tmp/logs_stramed-${namespace}-${{ matrix.job-name }}.txt ] && kubectl logs job/${{ matrix.job-name }} --all-containers -n ${namespace} || \
+              rm -vf /tmp/logs_stramed-${namespace}-${{ matrix.job-name }}.txt
+            kill %1 2>/dev/null && echo "Stopped log streaming" || true
+            exit $status