diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 8359f3febc..7e6f3dad6d 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -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: @@ -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 }} diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 6ca13bb15e..b2b512aaea 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -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: @@ -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 }} diff --git a/.github/workflows/deploy-unleash-api-token-preprod.yaml b/.github/workflows/deploy-unleash-api-token-preprod.yaml index b48eed2b6f..c2fdf45484 100644 --- a/.github/workflows/deploy-unleash-api-token-preprod.yaml +++ b/.github/workflows/deploy-unleash-api-token-preprod.yaml @@ -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 \ No newline at end of file diff --git a/.github/workflows/deploy-unleash-api-token-prod.yaml b/.github/workflows/deploy-unleash-api-token-prod.yaml index 9ddbb6343c..f1f78854ea 100644 --- a/.github/workflows/deploy-unleash-api-token-prod.yaml +++ b/.github/workflows/deploy-unleash-api-token-prod.yaml @@ -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 \ No newline at end of file