Konfigurer for deployment til nytt namespace

navikt · Jan 20, 2025 · 69e0b6a · 69e0b6a
1 parent 5847871
commit 69e0b6a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -24,7 +24,6 @@ jobs:
         run: yarn --prefer-offline --frozen-lockfile
       - name: Build
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_RELEASE: ${{ github.sha }}
         run: |

diff --git a/.github/workflows/build_n_deploy_dev.yaml b/.github/workflows/build_n_deploy_dev.yaml
@@ -29,7 +29,6 @@ jobs:
 
       - name: Build
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_RELEASE: ${{ github.sha }}
         run: |

diff --git a/.github/workflows/build_n_deploy_prod.yaml b/.github/workflows/build_n_deploy_prod.yaml
@@ -31,7 +31,6 @@ jobs:
 
       - name: Build
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_RELEASE: ${{ github.sha }}
         run: |

diff --git a/build_n_deploy/naiserator/naiserator_dev_gcp.yaml b/build_n_deploy/naiserator/naiserator_dev_gcp.yaml
@@ -1,10 +1,10 @@
 apiVersion: "nais.io/v1alpha1"
 kind: "Application"
 metadata:
-  name: familie-tilbake-frontend
-  namespace: teamfamilie
+  name: tilbakekreving-frontend
+  namespace: tilbake
   labels:
-    team: teamfamilie
+    team: tilbake
 spec:
   image: {{ image }}
   replicas:
@@ -25,8 +25,8 @@ spec:
     enabled: true
     path: /metrics
   ingresses:
-    - https://familie-tilbake-frontend.intern.dev.nav.no
-    - https://familie-tilbake-frontend.ansatt.dev.nav.no
+    - https://tilbakekreving-frontend.intern.dev.nav.no
+    - https://tilbakekreving-frontend.ansatt.dev.nav.no
   vault:
     enabled: false
   azure:
@@ -43,7 +43,7 @@ spec:
       enabled: true
       tenant: trygdeetaten.no
       replyURLs:
-        - "https://familie-tilbake-frontend.ansatt.dev.nav.no/auth/openid/callback"
+        - "https://tilbakekreving-frontend.ansatt.dev.nav.no/auth/openid/callback"
   webproxy: true
   accessPolicy:
     inbound:
@@ -60,9 +60,9 @@ spec:
     - name: APP_VERSION
       value: {{ VERSION }}
     - name: TILBAKE_SCOPE
-      value: api://dev-gcp.teamfamilie.familie-tilbake/.default
+      value: api://dev-gcp.tilbake.tilbakekreving-backend/.default
   envFrom:
-    - secret: familie-tilbake-frontend
+    - secret: tilbakekreving-frontend
   resources:
     limits:
       memory: 1024Mi

diff --git a/src/backend/config.ts b/src/backend/config.ts
@@ -16,7 +16,7 @@ const Environment = () => {
         return {
             buildPath: 'frontend_production',
             namespace: 'e2e',
-            proxyUrl: 'http://familie-tilbake:8030/api',
+            proxyUrl: 'http://tilbakekreving-backend:8030/api',
             baSakUrl: 'http://familie-ba-sak-frontend:8000',
             efSakUrl: 'http://familie-ef-sak-frontend:8000/ekstern',
             ksSakUrl: 'http://familie-ks-sak-frontend:8000',
@@ -25,7 +25,7 @@ const Environment = () => {
         return {
             buildPath: 'frontend_production',
             namespace: 'preprod',
-            proxyUrl: 'http://familie-tilbake/api',
+            proxyUrl: 'http://tilbakekreving-backend/api',
             baSakUrl: 'https://barnetrygd.ansatt.dev.nav.no',
             efSakUrl: 'https://ensligmorellerfar.ansatt.dev.nav.no/ekstern',
             ksSakUrl: 'https://kontantstotte.ansatt.dev.nav.no',
@@ -34,7 +34,7 @@ const Environment = () => {
         return {
             buildPath: 'frontend_development',
             namespace: 'local',
-            proxyUrl: 'https://familie-tilbake.intern.dev.nav.no/api',
+            proxyUrl: 'https://tilbakekreving-backend.intern.dev.nav.no/api',
             baSakUrl: 'https://barnetrygd.ansatt.dev.nav.no',
             efSakUrl: 'https://ensligmorellerfar.ansatt.dev.nav.no/ekstern',
             ksSakUrl: 'https://kontantstotte.ansatt.dev.nav.no',
@@ -44,7 +44,7 @@ const Environment = () => {
     return {
         buildPath: 'frontend_production',
         namespace: 'production',
-        proxyUrl: 'http://familie-tilbake/api',
+        proxyUrl: 'http://tilbakekreving-backend/api',
         baSakUrl: 'https://barnetrygd.intern.nav.no',
         efSakUrl: 'https://ensligmorellerfar.intern.nav.no/ekstern',
         ksSakUrl: 'https://kontantstotte.intern.nav.no',
@@ -54,7 +54,7 @@ const env = Environment();
 
 export const sessionConfig: ISessionKonfigurasjon = {
     cookieSecret: [`${process.env.COOKIE_KEY1}`, `${process.env.COOKIE_KEY2}`],
-    navn: 'familie-tilbake-v1',
+    navn: 'tilbakekreving-backend-v1',
     redisFullUrl: process.env.REDIS_URI_SESSIONS,
     redisBrukernavn: process.env.REDIS_USERNAME_SESSIONS,
     redisPassord: process.env.REDIS_PASSWORD_SESSIONS,
@@ -67,7 +67,7 @@ export const sessionConfig: ISessionKonfigurasjon = {
 };
 
 if (!process.env.TILBAKE_SCOPE) {
-    throw new Error('Scope mot familie-tilbake er ikke konfigurert');
+    throw new Error('Scope mot tilbakekreving-backend er ikke konfigurert');
 }
 
 export const oboTilbakeConfig: IApi = {