Merge pull request #1335 from navikt/ORG-1769_nais_deploy_v2

ORG-1769: Use nais/deploy/actions/deploy@v2
navikt · Jan 5, 2024 · b5c87f1 · b5c87f1
2 parents 48c34c7 + d93a8a0
commit b5c87f1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/.github/workflows/deploy-alerts.yaml b/.github/workflows/deploy-alerts.yaml
@@ -20,16 +20,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Deploy to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_ORG_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: apps/backend/nais/alerts-backend-dev-gcp.yaml
 
       - name: Deploy to prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_ORG_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: apps/backend/nais/alerts-backend-prod-gcp.yaml
 
@@ -41,15 +39,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Deploy to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_ORG_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: apps/frackend/nais/alerts-frackend-dev-gcp.yaml
 
       - name: Deploy to prod
         uses: nais/deploy/actions/deploy@v1
         env:
-          APIKEY: ${{ secrets.NAIS_ORG_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: apps/frackend/nais/alerts-frackend-prod-gcp.yaml
diff --git a/.github/workflows/deploy-backend.yaml b/.github/workflows/deploy-backend.yaml
@@ -60,9 +60,8 @@ 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_ORG_DEPLOY_APIKEY  }}
           CLUSTER: dev-gcp
           RESOURCE: apps/backend/nais/backend-dev-gcp.yaml
           VAR: image=${{needs.build.outputs.image}}
@@ -74,9 +73,8 @@ 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_ORG_DEPLOY_APIKEY  }}
           CLUSTER: prod-gcp
           RESOURCE: apps/backend/nais/backend-prod-gcp.yaml
           VAR: image=${{ needs.build.outputs.image }}
diff --git a/.github/workflows/deploy-frackend.yaml b/.github/workflows/deploy-frackend.yaml
@@ -69,9 +69,8 @@ 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_ORG_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: apps/frackend/nais/frackend-dev.yaml
           VAR: image=${{needs.build-app-docker.outputs.image}}
@@ -83,9 +82,8 @@ 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_ORG_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: apps/frackend/nais/frackend-prod.yaml
           VAR: image=${{needs.build-app-docker.outputs.image}}