Fix deploy env var naming for telemetry

navikt · Oct 18, 2024 · c86ec3b · c86ec3b
1 parent 3c12f7b
commit c86ec3b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -88,7 +88,7 @@ jobs:
           CLUSTER: "dev-fss"
           RESOURCE: ".nais/ebms-provider-dev.yaml"
           IMAGE: ${{ needs.build.outputs.providerimage }}
-          TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
+          TELEMETRY: ${{ steps.docker-push-ebms-provider.outputs.telemetry }}
   deploy-cpa-repo:
     name: "Deploy cpa-repo to dev"
     needs: "build"
@@ -102,7 +102,7 @@ jobs:
           CLUSTER: "dev-fss"
           RESOURCE: ".nais/cpa-repo-dev.yaml"
           IMAGE: ${{ needs.build.outputs.cpaimage }}
-          TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
+          TELEMETRY: ${{ steps.docker-push-cpa-repo.outputs.telemetry }}
   deploy-ebms-payload:
     name: "Deploy ebms-payload to dev"
     needs: "build"
@@ -116,4 +116,4 @@ jobs:
           CLUSTER: "dev-fss"
           RESOURCE: ".nais/ebms-payload-dev.yaml"
           IMAGE: ${{ needs.build.outputs.payloadimage }}
-          TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
+          TELEMETRY: ${{ steps.docker-push-ebms-payload.outputs.telemetry }}
diff --git a/.github/workflows/cpa-repo-deploy-dev.yaml b/.github/workflows/cpa-repo-deploy-dev.yaml
@@ -75,4 +75,4 @@ jobs:
           CLUSTER: "dev-fss"
           RESOURCE: ".nais/${{ env.NAIS_MANIFEST }}"
           IMAGE: ${{env.IMAGE_NAME}}
-          TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
+          TELEMETRY: ${{ steps.cpa-repo.outputs.telemetry }}
diff --git a/.github/workflows/ebms-payload-deploy-dev.yaml b/.github/workflows/ebms-payload-deploy-dev.yaml
@@ -57,6 +57,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Build and push ${{ env.MODULE_NAME }} docker image"
+        id: ${{ env.MODULE_NAME }}
         run: | 
           docker build --tag ${{ env.IMAGE_NAME }} -f Dockerfile ${{ env.MODULE_NAME }} --pull 
           docker push ${{ env.IMAGE_NAME }}
@@ -67,12 +68,11 @@ jobs:
     runs-on: "ubuntu-20.04"
     steps:
       - uses: "actions/checkout@v4"
-
       - name: "Deploy to DEV"
         uses: "nais/deploy/actions/deploy@v1"
         env:
           APIKEY: "${{ secrets.NAIS_DEPLOY_APIKEY }}"
           CLUSTER: "dev-fss"
           RESOURCE: ".nais/${{ env.NAIS_MANIFEST }}"
           IMAGE: ${{env.IMAGE_NAME}}
-          TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
+          TELEMETRY: ${{ steps.ebms-payload.outputs.telemetry }}
diff --git a/.github/workflows/ebms-provider-deploy-dev.yaml b/.github/workflows/ebms-provider-deploy-dev.yaml
@@ -57,6 +57,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Build and push ${{ env.MODULE_NAME }} docker image"
+        id: docker-build-push
         run: | 
           docker build --tag ${{ env.IMAGE_NAME }} -f Dockerfile ${{ env.MODULE_NAME }} --pull 
           docker push ${{ env.IMAGE_NAME }}

diff --git a/.github/workflows/kafka-dev.yaml b/.github/workflows/kafka-dev.yaml
@@ -23,4 +23,3 @@ jobs:
           CLUSTER: dev-gcp
           VAR: kafka-pool=nav-dev
           RESOURCE: ${{ env.TOPIC_FILE }}
-          TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
diff --git a/.github/workflows/old-build-prod.yaml b/.github/workflows/old-build-prod.yaml
@@ -46,10 +46,13 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: "Build and push ebms-provider Docker image"
+      id: "docker-build-push-ebms-provider"
       run: "docker build ebms-provider --pull --tag ${IMAGE_EBMS} -f Dockerfile && docker push ${IMAGE_EBMS}"
     - name: "Build and push cpa-repo Docker image"
+      id: "docker-build-push-cpa-repo"
       run: "docker build cpa-repo --pull --tag ${IMAGE_CPA} -f Dockerfile && docker push ${IMAGE_CPA}"
     - name: "Build and push ebms-payload Docker image"
+      id: "docker-build-push-ebms-payload"
       run: "docker build ebms-payload --pull --tag ${IMAGE_PAYLOAD} -f Dockerfile && docker push ${IMAGE_PAYLOAD}"
   deploy-processor:
     name: "Deploy ebms provider to PROD"
@@ -64,7 +67,7 @@ jobs:
         CLUSTER: "prod-fss"
         RESOURCE: ".nais/ebms-provider-prod.yaml"
         IMAGE: ${{env.IMAGE_EBMS}}
-        TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
+        TELEMETRY: ${{ steps.docker-build-push-ebms-provider.outputs.telemetry }}
   deploy-cpa-repo:
     name: "Deploy cpa-repo to prod"
     needs: "build"
@@ -78,7 +81,7 @@ jobs:
           CLUSTER: "prod-fss"
           RESOURCE: ".nais/cpa-repo-prod.yaml"
           IMAGE: ${{env.IMAGE_CPA}}
-          TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
+          TELEMETRY: ${{ steps.docker-build-push-cpa-repo.outputs.telemetry }}
   deploy-ebms-payload:
     name: "Deploy ebms-payload to prod"
     needs: "build"
@@ -92,4 +95,4 @@ jobs:
           CLUSTER: "prod-fss"
           RESOURCE: ".nais/ebms-payload-prod.yaml"
           IMAGE: ${{env.IMAGE_PAYLOAD}}
-          TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
+          TELEMETRY: ${{ steps.docker-build-push-ebms-payload.outputs.telemetry }}
diff --git a/.github/workflows/old-build.yaml b/.github/workflows/old-build.yaml
@@ -52,10 +52,13 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: "Build and push ebms-provider Docker image"
+      id: "docker-build-push-ebms-provider"
       run: "docker build ebms-provider --pull --tag ${IMAGE_EBMS} -f Dockerfile && docker push ${IMAGE_EBMS}"
     - name: "Build and push cpa-repo Docker image"
+      id: "docker-build-push-cpa-repo"
       run: "docker build cpa-repo --pull --tag ${IMAGE_CPA} -f Dockerfile && docker push ${IMAGE_CPA}"
     - name: "Build and push ebms-payload Docker image"
+      id: "docker-build-push-ebms-payload"
       run: "docker build ebms-payload --pull --tag ${IMAGE_PAYLOAD} -f Dockerfile && docker push ${IMAGE_PAYLOAD}"
   deploy-processor:
     name: "Deploy ebms provider to dev"
@@ -70,6 +73,7 @@ jobs:
         CLUSTER: "dev-fss"
         RESOURCE: ".nais/ebms-provider-dev.yaml"
         IMAGE: ${{env.IMAGE_EBMS}}
+        TELEMETRY: ${{ steps.docker-build-push-ebms-provider.outputs.telemetry }}
   deploy-cpa-repo:
     name: "Deploy cpa-repo to dev"
     needs: "build"
@@ -83,6 +87,7 @@ jobs:
         CLUSTER: "dev-fss"
         RESOURCE: ".nais/cpa-repo-dev.yaml"
         IMAGE: ${{env.IMAGE_CPA}}
+        TELEMETRY: ${{ steps.docker-build-push-cpa-repo.outputs.telemetry }}
   deploy-ebms-payload:
     name: "Deploy ebms-payload to dev"
     needs: "build"
@@ -96,4 +101,4 @@ jobs:
           CLUSTER: "dev-fss"
           RESOURCE: ".nais/ebms-payload-dev.yaml"
           IMAGE: ${{env.IMAGE_PAYLOAD}}
-          TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
+          TELEMETRY: ${{ steps.docker-build-push-ebms-payload.outputs.telemetry }}