diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml index be73fd2e5..585a41641 100644 --- 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 index ddab74460..2d1925efd 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -36,7 +36,7 @@ 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 @@ -44,9 +44,9 @@ jobs: 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 index 8da5c5adb..206c6ad9c 100644 --- 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