From 8fd058ffbcafd2251267f7af529cf81a1e5be247 Mon Sep 17 00:00:00 2001
From: JulieHillRoa <julie.hill.roa@nav.no>
Date: Tue, 20 Feb 2024 14:47:08 +0100
Subject: [PATCH] =?UTF-8?q?n=C3=B8kkelfri=20deploy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-deploy-feature-branch-q1.yaml | 2 +-
 .github/workflows/deploy-unleash-api-token.yaml       | 5 +++--
 .github/workflows/main.yml                            | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-deploy-feature-branch-q1.yaml b/.github/workflows/build-deploy-feature-branch-q1.yaml
index ad1ed8ac3e..5f8e30e29b 100644
--- a/.github/workflows/build-deploy-feature-branch-q1.yaml
+++ b/.github/workflows/build-deploy-feature-branch-q1.yaml
@@ -8,6 +8,7 @@ env:
 permissions:
   packages: write
   contents: write
+  id-token: write
 jobs:
   build-and-push:
     name: Build and push
@@ -49,7 +50,6 @@ jobs:
       - name: Deploy application
         uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-fss
           RESOURCE: .nais/application/application-config-dev.yaml
           VAR: image=${{ needs.build-and-push.outputs.image }}
diff --git a/.github/workflows/deploy-unleash-api-token.yaml b/.github/workflows/deploy-unleash-api-token.yaml
index a20ae2e9a0..c80536f3b2 100644
--- a/.github/workflows/deploy-unleash-api-token.yaml
+++ b/.github/workflows/deploy-unleash-api-token.yaml
@@ -10,6 +10,9 @@ on:
       - '.nais/application/unleash-apitoken-dev.yaml'
       - '.nais/application/unleash-apitoken-prod.yaml'
 
+permissions:
+  id-token: write
+
 jobs:
   deploy-dev:
     name: Deploy unleash-apitoken to dev
@@ -20,7 +23,6 @@ jobs:
       - name: Deploy unleash-apitoken
         uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-fss
           RESOURCE: .nais/application/unleash-apitoken-dev.yaml
           PRINT_PAYLOAD: true
@@ -36,7 +38,6 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         if: github.ref == 'refs/heads/master'
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-fss
           RESOURCE: .nais/application/unleash-apitoken-prod.yaml
           PRINT_PAYLOAD: true
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c09ef6d920..1127e256c3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,6 +6,7 @@ env:
 permissions:
   packages: write
   contents: write
+  id-token: write
 jobs:
   test:
     name: Run tests
@@ -70,7 +71,6 @@ jobs:
       - name: Deploy application
         uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-fss
           RESOURCE: .nais/application/application-config-dev.yaml
           VAR: image=${{ needs.build-and-push.outputs.image }}
@@ -87,7 +87,6 @@ jobs:
       - name: Deploy application
         uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-fss
           RESOURCE: .nais/application/application-config-prod.yaml
           VAR: image=${{ needs.build-and-push.outputs.image }}