Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uten nais deploy api key #2496

Merged
merged 4 commits into from
Jan 2, 2024
Merged

Uten nais deploy api key #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a98e213
Vil deploye uten NAIS_DEPLOY_APIKEY
ma10s Jan 2, 2024
0715c5b
Vil deploye uten NAIS_DEPLOY_APIKEY. Tester med id-token permission p…
ma10s Jan 2, 2024
456fdb0
Trenger id-token permission på rot for å få tilgang ved deploy (deplo…
ma10s Jan 2, 2024
938fba2
Merge branch 'master' into uten-nais-deploy-api-key
ma10s Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/deploy-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ on:
env:
IMAGE: ghcr.io/navikt/familie-ef-sak:${{ github.sha }}

permissions:
contents: "read"
id-token: "write"

jobs:
build:
name: Build, push and deploy to dev-gcp
runs-on: ubuntu-latest
permissions:
contents: "read"
id-token: "write"
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -44,7 +45,6 @@ jobs:
- uses: actions/checkout@v4
- uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-gcp
RESOURCE: .deploy/preprod.yaml
IMAGE: ${{ needs.build.outputs.image }}
9 changes: 4 additions & 5 deletions .github/workflows/deploy-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ on:
env:
IMAGE: ghcr.io/navikt/familie-ef-sak:${{ github.sha }}

permissions:
contents: "read"
id-token: "write"

jobs:
build:
name: Build, push and deploy to dev-gcp and prod-gcp
runs-on: ubuntu-latest
permissions:
contents: "read"
id-token: "write"
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -54,14 +55,12 @@ jobs:
- name: Deploy til dev-gcp
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-gcp
RESOURCE: .deploy/preprod.yaml
IMAGE: ${{ needs.build.outputs.image }}
- name: Deploy til prod-gcp
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: prod-gcp
RESOURCE: .deploy/prod.yaml
IMAGE: ${{ needs.build.outputs.image }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-unleash-api-token-preprod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
- name: deploy unleash api-token
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-gcp
RESOURCE: .deploy/unleash-apitoken-preprod.yaml
PRINT_PAYLOAD: true
1 change: 0 additions & 1 deletion .github/workflows/deploy-unleash-api-token-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
- name: deploy unleash api-token
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: prod-gcp
RESOURCE: .deploy/unleash-apitoken-prod.yaml
PRINT_PAYLOAD: true