Merge branch 'main' into dependabot/maven/no.nav.familie-prosessering…

…-core-2.20231212093500_bfa0e7c
navikt · Dec 18, 2023 · 40c77c2 · 40c77c2
2 parents 4de45d2 + 94b0c2a
commit 40c77c2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml
@@ -76,9 +76,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Deploy til dev-gcp team namespace
         if: (github.triggering_actor != 'dependabot[bot]' || github.event_name != 'merge_group')
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/nais/app-preprod.yaml
-          IMAGE: ${{ needs.build-dev.outputs.image }}
+          VAR: image=${{ needs.build-dev.outputs.image }}
diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml
@@ -36,17 +36,17 @@ jobs:
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           byosbom: target/bom.json
       - name: Deploy til dev-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/nais/app-preprod.yaml
           IMAGE: ${{ steps.docker-push.outputs.image }}
       - name: Deploy til prod-gcp
         if: github.ref == 'refs/heads/main'
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .deploy/nais/app-prod.yaml
-          IMAGE: ${{ steps.docker-push.outputs.image }}
+          VAR: image=${{ steps.docker-push.outputs.image }}
diff --git a/.github/workflows/krise-rett-i-prod.yml b/.github/workflows/krise-rett-i-prod.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Push Docker image med 'latest' tag
         run: docker push ${IMAGE_LATEST}
       - name: Deploy til prod-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp