Uten nais deploy api key (#2496)

* Vil deploye uten NAIS_DEPLOY_APIKEY * Trenger id-token permission på rot for å få tilgang ved deploy (deploy@v2).
navikt · Jan 2, 2024 · dcf2862 · dcf2862
1 parent 44be7e0
commit dcf2862
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -5,13 +5,14 @@ on:
 env:
   IMAGE: ghcr.io/navikt/familie-ef-sak:${{ github.sha }}
 
+permissions:
+  contents: "read"
+  id-token: "write"
+
 jobs:
   build:
     name: Build, push and deploy to dev-gcp
     runs-on: ubuntu-latest
-    permissions:
-      contents: "read"
-      id-token: "write"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -44,7 +45,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/preprod.yaml
           IMAGE: ${{ needs.build.outputs.image }}
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -8,13 +8,14 @@ on:
 env:
   IMAGE: ghcr.io/navikt/familie-ef-sak:${{ github.sha }}
 
+permissions:
+  contents: "read"
+  id-token: "write"
+
 jobs:
   build:
     name: Build, push and deploy to dev-gcp and prod-gcp
     runs-on: ubuntu-latest
-    permissions:
-      contents: "read"
-      id-token: "write"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -54,14 +55,12 @@ jobs:
       - name: Deploy til dev-gcp
         uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/preprod.yaml
           IMAGE: ${{ needs.build.outputs.image }}
       - name: Deploy til prod-gcp
         uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .deploy/prod.yaml
           IMAGE: ${{ needs.build.outputs.image }}

diff --git a/.github/workflows/deploy-unleash-api-token-preprod.yaml b/.github/workflows/deploy-unleash-api-token-preprod.yaml
@@ -12,7 +12,6 @@ jobs:
       - name: deploy unleash api-token
         uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/unleash-apitoken-preprod.yaml
           PRINT_PAYLOAD: true
diff --git a/.github/workflows/deploy-unleash-api-token-prod.yaml b/.github/workflows/deploy-unleash-api-token-prod.yaml
@@ -12,7 +12,6 @@ jobs:
       - name: deploy unleash api-token
         uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .deploy/unleash-apitoken-prod.yaml
           PRINT_PAYLOAD: true