Merge branch 'main' into dependabot/maven/all-dependencies-fa63ffef70

navikt · Feb 2, 2024 · 4ffe7f5 · 4ffe7f5
2 parents 9a98252 + 18fd199
commit 4ffe7f5
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 41 deletions.
diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml
@@ -9,7 +9,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Read/save maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-cache-ef-iverksett-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/deploy-dev.yaml b/.github/workflows/deploy-dev.yaml
@@ -5,17 +5,20 @@ on:
 env:
   IMAGE: ghcr.io/navikt/familie-ef-iverksett:${{ github.sha }}
 
+permissions:
+  contents: "read"
+  id-token: "write"
+  packages: "write"
+
 jobs:
   build:
     name: Build, push and deploy to dev-gcp
     runs-on: ubuntu-latest
-    permissions:
-      packages: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Read/save maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-cache-ef-iverksett-${{ hashFiles('**/pom.xml') }}
@@ -45,8 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v1
+      - uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/nais-preprod.yaml
diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml
@@ -6,17 +6,20 @@ on:
 env:
   IMAGE: ghcr.io/navikt/familie-ef-iverksett:${{ github.sha }}
 
+permissions:
+  contents: "read"
+  id-token: "write"
+  packages: "write"
+
 jobs:
   build:
     name: Build, push and deploy to prod-gcp
     runs-on: ubuntu-latest
-    permissions:
-      packages: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Read/save maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-cache-ef-iverksett-${{ hashFiles('**/pom.xml') }}
@@ -53,15 +56,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Deploy til dev-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/nais-preprod.yaml
       - name: Deploy til prod-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .deploy/nais-prod.yaml
       - name: Post deploy failures to Slack

diff --git a/.github/workflows/deploy-unleash-api-token-preprod.yaml b/.github/workflows/deploy-unleash-api-token-preprod.yaml
@@ -3,16 +3,20 @@ name: Deploy unleash api-token for dev
 on:
   workflow_dispatch:
 
+permissions:
+  contents: "read"
+  id-token: "write"
+  packages: "write"
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: deploy unleash api-token
-        uses: nais/deploy/actions/deploy@v1
+        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
@@ -3,16 +3,20 @@ name: Deploy unleash api-token for prod
 on:
   workflow_dispatch:
 
+permissions:
+  contents: "read"
+  id-token: "write"
+  packages: "write"
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: deploy unleash api-token
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .deploy/unleash-apitoken-prod.yaml
           PRINT_PAYLOAD: true
diff --git a/.github/workflows/manual-deploy-kafka-aiven.yaml b/.github/workflows/manual-deploy-kafka-aiven.yaml
@@ -3,93 +3,86 @@ name: Deploy kafka topics
 on:
   workflow_dispatch:
 
+permissions:
+  contents: "read"
+  id-token: "write"
+  packages: "write"
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: deploy vedtaksstatistikk to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: kafka-aiven/statistikk-ensligforsorger-vedtak/topic-dev.yaml
           PRINT_PAYLOAD: true
       - name: deploy behandlingsstatistikk to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: kafka-aiven/statistikk-ensligforsorger-behandling/topic-dev.yaml
           PRINT_PAYLOAD: true
       - name: deploy infotrygd aivenapp to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: kafka-aiven/overgangsstønad-infotrygd-vedtak/aivenapp-infotrygd-goldengate-dev.yaml
           PRINT_PAYLOAD: true
       - name: deploy infotrygd aivenapp to prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: kafka-aiven/overgangsstønad-infotrygd-vedtak/aivenapp-infotrygd-goldengate-prod.yaml
           PRINT_PAYLOAD: true
       - name: deploy infotrygd kafka-topic to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: kafka-aiven/overgangsstønad-infotrygd-vedtak/topic-infotrygd-dev.yaml
           PRINT_PAYLOAD: true
       - name: deploy infotrygd kafka-topic to prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: kafka-aiven/overgangsstønad-infotrygd-vedtak/topic-infotrygd-prod.yaml
           PRINT_PAYLOAD: true
       - 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: kafka-aiven/statistikk-ensligforsorger-vedtak/topic-prod.yaml
           PRINT_PAYLOAD: true
       - name: deploy behandlingsstatistikk to prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: kafka-aiven/statistikk-ensligforsorger-behandling/topic-prod.yaml
           PRINT_PAYLOAD: true
       - name: deploy vedtak kafka-topic to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: kafka-aiven/vedtak/topic-vedtak-dev.yaml
           PRINT_PAYLOAD: true
       - name: deploy vedtak to prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: kafka-aiven/vedtak/topic-vedtak-prod.yaml
           PRINT_PAYLOAD: true
       - name: deploy arbeidsoppfølging topic to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: kafka-aiven/arbeidsoppfølging/topic-arbeidsoppfølging-dev.yaml
           PRINT_PAYLOAD: true
       - name: deploy arbeidsoppfølging topic to prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: kafka-aiven/arbeidsoppfølging/topic-arbeidsoppfølging-prod.yaml
           PRINT_PAYLOAD: true