Merge pull request #263 from navikt/nais-deploy-v2-uten-apikey

Nøkkelfri deploy fra Github
navikt · Feb 12, 2024 · 5585182 · 5585182
2 parents 4450e15 + e6461d2
commit 5585182
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/alert-deploy.yml b/.github/workflows/alert-deploy.yml
@@ -23,26 +23,28 @@ jobs:
     name: Apply alerts to prod
     if: (github.event_name == 'push' && github.ref_name == 'main') || inputs.environment == 'prod'
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: deploy to prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .nais/alerts.yml
 
   apply-alerts-dev:
     name: Apply alerts to dev
     if: inputs.environment == 'preprod'
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: deploy to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .nais/alerts-preprod.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,11 +28,12 @@ jobs:
     name: Deploy to prod
     needs: [build-and-test, build-and-push]
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
       - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v1
+      - uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           DRY_RUN: false
           PRINT_PAYLOAD: true
           CLUSTER: prod-gcp

diff --git a/.github/workflows/preprod-alt.yml b/.github/workflows/preprod-alt.yml
@@ -21,11 +21,12 @@ jobs:
     name: Deploy to preprod-alt
     needs: [build-and-test, build-and-push]
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
       - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v1
+      - uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           DRY_RUN: false
           PRINT_PAYLOAD: true
           CLUSTER: dev-gcp

diff --git a/.github/workflows/preprod.yml b/.github/workflows/preprod.yml
@@ -28,11 +28,12 @@ jobs:
     name: Deploy to preprod
     needs: [build-and-test, build-and-push]
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
       - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v1
+      - uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           DRY_RUN: false
           PRINT_PAYLOAD: true
           CLUSTER: dev-gcp