Merge pull request #2199 from navikt/dev

[PROD] Bruk prod dekoratør i prod
navikt · Jun 21, 2024 · d3a9b6b · d3a9b6b
2 parents f15cec8 + a9476ff
commit d3a9b6b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.env.production b/.env.production
@@ -1,7 +1,7 @@
 VITE_MOCK_ENABLED=false
 VITE_USE_HASH_ROUTER=false
 VITE_HODE_URL=/internarbeidsflatedecorator
-VITE_HODE_URL_V2=https://cdn.nav.no/personoversikt/internarbeidsflate-decorator-v3/dev
+VITE_HODE_URL_V2=https://cdn.nav.no/personoversikt/internarbeidsflate-decorator-v3/prod
 SKIP_PREFLIGHT_CHECK=true
 VITE_AMPLITUDE_API_KEY=4b7349a378cfc18faf21e1fe6bea0cf2
 VITE_AMPLITUDE_API_KEY_DEV=716ce898b7143ffd7ff3e52dfe69bae7
diff --git a/.nais/dev.yaml b/.nais/dev.yaml
@@ -60,6 +60,7 @@ spec:
         - application: modiapersonoversikt-skrivestotte
         - application: modiapersonoversikt-draft
         - application: modiacontextholder
+        - application: modiapersonoversikt-api
       external:
         - host: personoversikt-unleash-api.nav.cloud.nais.io
         - host: modiapersonoversikt-api-q1.dev-fss-pub.nais.io
@@ -82,3 +83,5 @@ spec:
       value: wss://modiapersonoversikt-draft.intern.dev.nav.no
     - name: CONFIG_PATH
       value: "./proxy-config-dev.json"
+    - name: LOG_LEVEL
+      value: debug
diff --git a/Dockerfile.gcp b/Dockerfile.gcp
@@ -1,4 +1,4 @@
-FROM europe-north1-docker.pkg.dev/nais-management-233d/personoversikt/modia-frontend:0.14
+FROM europe-north1-docker.pkg.dev/nais-management-233d/personoversikt/modia-frontend:0.16
 ADD proxy-config-q2.json proxy-config-dev.json
 ADD proxy-config-prod.json proxy-config-prod.json
 COPY build ./static

diff --git a/package-lock.json b/package-lock.json
diff --git a/proxy-config-prod.json b/proxy-config-prod.json
@@ -13,8 +13,8 @@
             "scope": "api://prod-gcp.personoversikt.modiapersonoversikt-innstillinger/.default"
         },
         "modiacontextholder": {
-            "url": "https://modiacontextholder.prod-fss-pub.nais.io/modiacontextholder",
-            "scope": "api://prod-fss.personoversikt.modiacontextholder/.default"
+            "url": "http://modiacontextholder.personoversikt.svc.cluster.local",
+            "scope": "api://prod-gcp.personoversikt.modiacontextholder/.default"
         },
         "azure-api": {
             "url": "https://modiapersonoversikt-api.prod-fss-pub.nais.io/modiapersonoversikt-api/rest",

diff --git a/proxy-config-q2.json b/proxy-config-q2.json
@@ -13,12 +13,12 @@
             "scope": "api://dev-gcp.personoversikt.modiapersonoversikt-innstillinger/.default"
         },
         "modiacontextholder": {
-            "url": "http://modiacontextholder.personoversikt.svc.cluster.local/modiacontextholder",
+            "url": "http://modiacontextholder.personoversikt.svc.cluster.local",
             "scope": "api://dev-gcp.personoversikt.modiacontextholder/.default"
         },
         "azure-api": {
-            "url": "https://modiapersonoversikt-api-q1.dev-fss-pub.nais.io/modiapersonoversikt-api/rest",
-            "scope": "api://dev-fss.personoversikt.modiapersonoversikt-api-q1/.default"
+            "url": "http://modiapersonoversikt-api.personoversikt.svc.cluster.local/modiapersonoversikt-api/rest",
+            "scope": "api://dev-gcp.personoversikt.modiapersonoversikt-api/.default"
         }
     },
     "contentSecurityPolicy": {