Fikser deploy v2.

navikt · Jan 2, 2024 · 4bc1247 · 4bc1247
1 parent 851a0ee
commit 4bc1247
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/apply-alerts.yml b/.github/workflows/apply-alerts.yml
@@ -16,11 +16,12 @@ jobs:
     name: Deploy to dev-gcp
     if: startsWith(github.ref, 'refs/heads/dev-') || startsWith(github.ref, 'refs/heads/main') # Deploy if branch is either master or dev-*
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
       - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: nais/alerterator-dev.yml
           VARS: nais/dev-gcp.json
@@ -29,11 +30,12 @@ jobs:
     name: Deploy to prod-gcp
     if: startsWith(github.ref, 'refs/heads/main')  # If the branch is master
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
       - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: nais/alerterator-prod.yml
           VARS: nais/prod-gcp.json
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -75,6 +75,7 @@ jobs:
     uses: navikt/sif-gha-workflows/.github/workflows/gradle-deploy.yml@main
     permissions:
       contents: read
+      id-token: write
     secrets: inherit
     with:
       image: ${{ needs.build.outputs.image }}