IS-1921: Deploy v2 (#492)

Author: andersrognstad

.github/workflows/alerts.yaml

@@ -10,12 +10,13 @@ jobs:
   apply-alerts:
     name: Apply alerts to cluster
     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.yaml

.github/workflows/kafka.yaml

@@ -8,6 +8,9 @@ on:
       - '.github/workflows/kafka.yaml'
       - '.nais/kafka/**'
 
+permissions:
+  id-token: write
+
 jobs:
   deploy-kafka-dev:
     name: Deploy Kafka topic to NAIS dev-gcp
@@ -16,17 +19,15 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: deploy statusendring dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .nais/kafka/statusendring.yaml
           VARS: .nais/kafka/dev.json
 
       - name: deploy dialogmotesvar dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .nais/kafka/dialogmotesvar.yaml
           VARS: .nais/kafka/dev.json
@@ -40,17 +41,15 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: deploy statusendring prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .nais/kafka/statusendring.yaml
           VARS: .nais/kafka/prod.json
 
       - name: deploy dialogmotesvar prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .nais/kafka/dialogmotesvar.yaml
           VARS: .nais/kafka/prod.json

.github/workflows/redis.yaml

@@ -13,18 +13,18 @@ jobs:
   apply-redis-cache:
     name: Apply Redis instance for caching
     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/redis-config.yaml,.nais/redisexporter.yaml"
       - 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/redis-config.yaml,.nais/redisexporter.yaml"