diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9d5313e..34fdc8d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -57,7 +57,7 @@ jobs: needs: [build] if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest - environment: dev-fss + environment: dev-gcp steps: - name: Fetch NAIS yaml uses: actions/download-artifact@v4 @@ -68,7 +68,7 @@ jobs: - uses: nais/deploy/actions/deploy@v2 env: APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }} - CLUSTER: dev-fss + CLUSTER: dev-gcp RESOURCE: .nais/nais.yaml VAR: image=${{ needs.build.outputs.image }} VARS: .nais/dev-vars.yaml @@ -79,7 +79,7 @@ jobs: needs: [build, deploy-dev] if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest - environment: prod-fss + environment: prod-gcp steps: - name: Fetch NAIS yaml uses: actions/download-artifact@v4 @@ -90,7 +90,7 @@ jobs: - uses: nais/deploy/actions/deploy@v2 env: APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }} - CLUSTER: prod-fss + CLUSTER: prod-gcp RESOURCE: .nais/nais.yaml VAR: image=${{ needs.build.outputs.image }} VARS: .nais/prod-vars.yaml diff --git a/.nais/dev-vars.yaml b/.nais/dev-vars.yaml index 706e3e4..c3709d2 100644 --- a/.nais/dev-vars.yaml +++ b/.nais/dev-vars.yaml @@ -1,7 +1,7 @@ kafka: pool: nav-dev dp_inntekt: - scope: api://dev-fss.teamdagpenger.dp-inntekt-api/.default + scope: api://dev-gcp.teamdagpenger.dp-inntekt-api/.default replicas: min: 1 diff --git a/.nais/nais.yaml b/.nais/nais.yaml index ae271f7..aa1b95f 100644 --- a/.nais/nais.yaml +++ b/.nais/nais.yaml @@ -32,14 +32,15 @@ spec: requests: cpu: 100m memory: 256Mi - vault: - enabled: true secureLogs: enabled: true azure: application: enabled: true - webproxy: true + accessPolicy: + outbound: + rules: + - application: dp-inntekt-api env: - name: DP_INNTEKT_API_SCOPE - value: {{dp_inntekt.scope}} \ No newline at end of file + value: {{dp_inntekt.scope}} diff --git a/.nais/prod-vars.yaml b/.nais/prod-vars.yaml index 72f49d9..1847bae 100644 --- a/.nais/prod-vars.yaml +++ b/.nais/prod-vars.yaml @@ -1,7 +1,7 @@ kafka: pool: nav-prod dp_inntekt: - scope: api://prod-fss.teamdagpenger.dp-inntekt-api/.default + scope: api://prod-gcp.teamdagpenger.dp-inntekt-api/.default replicas: min: 4