diff --git a/.github/workflows/deploy-alerts-to-prod.yaml b/.github/workflows/deploy-alerts-to-prod.yaml index 0461dae..1e50790 100644 --- a/.github/workflows/deploy-alerts-to-prod.yaml +++ b/.github/workflows/deploy-alerts-to-prod.yaml @@ -11,6 +11,7 @@ on: permissions: packages: write contents: write + id-token: write jobs: deploy-alerts: name: Deploy alerts to prod-fss @@ -20,8 +21,7 @@ jobs: uses: actions/checkout@v4 - name: Deploy to prod-fss - uses: nais/deploy/actions/deploy@v1 + uses: nais/deploy/actions/deploy@v2 env: - APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY_OBO }} CLUSTER: prod-fss RESOURCE: .nais/alerts/alerts-config-prod.yaml diff --git a/.github/workflows/deploy-til-dev.yaml b/.github/workflows/deploy-til-dev.yaml index d7e1cee..a471c55 100644 --- a/.github/workflows/deploy-til-dev.yaml +++ b/.github/workflows/deploy-til-dev.yaml @@ -10,6 +10,7 @@ env: permissions: packages: write contents: write + id-token: write jobs: test: @@ -32,8 +33,6 @@ jobs: runs-on: ubuntu-latest outputs: image: ${{ steps.docker-build-push.outputs.image }} - permissions: - id-token: write steps: - name: Checkout uses: actions/checkout@v4 @@ -64,9 +63,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Deploy application - uses: nais/deploy/actions/deploy@v1 + uses: nais/deploy/actions/deploy@v2 env: - APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }} CLUSTER: dev-fss RESOURCE: .nais/application/application-config-dev.yaml VAR: image=${{ needs.test-build-and-push.outputs.image }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1782c35..b517ab9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,6 +6,7 @@ env: permissions: packages: write contents: write + id-token: write jobs: test: name: Run tests @@ -31,8 +32,6 @@ jobs: if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master' outputs: image: ${{ steps.docker-build-push.outputs.image }} - permissions: - id-token: write steps: - name: Checkout uses: actions/checkout@v4 @@ -65,9 +64,8 @@ jobs: uses: actions/checkout@v4 - name: Deploy application - uses: nais/deploy/actions/deploy@v1 + uses: nais/deploy/actions/deploy@v2 env: - APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }} CLUSTER: dev-fss RESOURCE: .nais/application/application-config-dev.yaml VAR: image=${{ needs.test-build-and-push.outputs.image }} @@ -82,9 +80,8 @@ jobs: uses: actions/checkout@v4 - name: Deploy application - uses: nais/deploy/actions/deploy@v1 + uses: nais/deploy/actions/deploy@v2 env: - APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }} CLUSTER: prod-fss RESOURCE: .nais/application/application-config-prod.yaml VAR: image=${{ needs.test-build-and-push.outputs.image }}