Skip to content

Commit a4ef5da

Browse files
committed
Keyless deploy.
1 parent d5c18ac commit a4ef5da

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

.github/workflows/deploy-to-dev.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Manual deploy to dev
33
on:
44
workflow_call:
55
secrets:
6-
NAIS_DEPLOY_API_KEY:
7-
description: "API key for nais/deploy"
8-
required: true
96
NAIS_WORKLOAD_IDENTITY_PROVIDER:
107
description: "Identity provider for nais/docker-build-push"
118
required: true
@@ -84,13 +81,12 @@ jobs:
8481
name: Checkout code
8582

8683
- name: Deploy to dev
87-
uses: nais/deploy/actions/deploy@v1
84+
uses: nais/deploy/actions/deploy@v2
8885
env:
8986
TEAM: klage
9087
CLUSTER: dev-gcp
9188
VARS: deploy/dev.yaml
9289
RESOURCE: deploy/nais.yaml
93-
APIKEY: ${{ secrets.NAIS_DEPLOY_API_KEY }}
9490
VAR: image=${{ needs.build.outputs.image }}
9591
IMAGE: ${{ needs.build.outputs.image }}
9692

.github/workflows/deploy-to-prod.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Manual deploy to prod
33
on:
44
workflow_call:
55
secrets:
6-
NAIS_DEPLOY_API_KEY:
7-
description: "API key for nais/deploy"
8-
required: true
96
NAIS_WORKLOAD_IDENTITY_PROVIDER:
107
description: "Identity provider for nais/docker-build-push"
118
required: true
@@ -39,13 +36,12 @@ jobs:
3936
run: echo "image=${{ steps.image-registry.outputs.registry }}/kabal-smart-editor-api:${{ github.sha }}" >> $GITHUB_OUTPUT
4037

4138
- name: Deploy to prod
42-
uses: nais/deploy/actions/deploy@v1
39+
uses: nais/deploy/actions/deploy@v2
4340
env:
4441
TEAM: klage
4542
CLUSTER: prod-gcp
4643
VARS: deploy/prod.yaml
4744
RESOURCE: deploy/nais.yaml
48-
APIKEY: ${{ secrets.NAIS_DEPLOY_API_KEY }}
4945
VAR: image=${{ steps.image.outputs.image }}
5046
IMAGE: ${{ steps.image.outputs.image }}
5147

.github/workflows/main.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
id-token: write
1616
uses: ./.github/workflows/deploy-to-dev.yaml
1717
secrets:
18-
NAIS_DEPLOY_API_KEY: ${{ secrets.NAIS_DEPLOY_API_KEY }}
1918
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
2019

2120
deploy_to_prod:
@@ -26,5 +25,4 @@ jobs:
2625
needs: deploy_to_dev
2726
uses: ./.github/workflows/deploy-to-prod.yaml
2827
secrets:
29-
NAIS_DEPLOY_API_KEY: ${{ secrets.NAIS_DEPLOY_API_KEY }}
3028
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}

0 commit comments

Comments
 (0)