From ee96e39317d9f6f96eb93fcb707d7e5618412e8d Mon Sep 17 00:00:00 2001
From: Giao The Cung <giaothe@gmail.com>
Date: Fri, 9 Feb 2024 17:51:03 +0100
Subject: [PATCH] Deploye app til gcp

---
 .github/workflows/deploy.yml | 8 ++++----
 .nais/dev-vars.yaml          | 2 +-
 .nais/nais.yaml              | 3 ---
 .nais/prod-vars.yaml         | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d89ac1d..98c3030 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..299065c 100644
--- a/.nais/nais.yaml
+++ b/.nais/nais.yaml
@@ -32,14 +32,11 @@ spec:
     requests:
       cpu: 100m
       memory: 256Mi
-  vault:
-    enabled: true
   secureLogs:
     enabled: true
   azure:
     application:
       enabled: true
-  webproxy: true
   env:
     - name: DP_INNTEKT_API_SCOPE
       value: {{dp_inntekt.scope}}
\ No newline at end of file
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