Merge pull request #1498 from navikt/migrere-til-unleash-next

Migrere til unleash next
navikt · Oct 16, 2023 · d59d91e · d59d91e
2 parents 224f624 + 32329fe
commit d59d91e
Show file tree

Hide file tree

Showing 16 changed files with 953 additions and 87 deletions.
diff --git a/.env b/.env
@@ -13,4 +13,6 @@ CASETYPE_ID=66D660EF-6F14-44B4-8ADE-A70A127202D0
 NAV_GROUP_ID=A034081B-6B73-46B7-BE27-23B8E9CE3079
 OPPORTUNITY_ID=615FF5E7-37B7-4697-A35F-72598B0DC53B
 SOLUTION_ID=5EB316A1-11E2-460A-B4E3-F82DBD13E21D
-VARSEL_API_URL=http://localhost:8095/tms-varsel-api
+VARSEL_API_URL=http://localhost:8095/tms-varsel-api
+UNLEASH_SERVER_API_URL=http://localhost:8095/unleash
+UNLEASH_SERVER_API_TOKEN=dummy_token
diff --git a/.nais/config.yaml b/.nais/config.yaml
@@ -44,6 +44,7 @@ spec:
   {{/each}}
   envFrom:
     - secret: nav-dekoratoren
+    - secret: nav-dekoratoren-unleash-api-token
   filesFrom:
     - configmap: dekoratoren-config
       mountPath: /app/config

diff --git a/.nais/unleash/unleash-api-token.dev.yml → .nais/unleash/unleash-api-token.dev.yaml b/.nais/unleash/unleash-api-token.dev.yml → .nais/unleash/unleash-api-token.dev.yaml
@@ -2,16 +2,13 @@ apiVersion: unleash.nais.io/v1
 kind: ApiToken
 metadata:
   name: nav-dekoratoren
-  namespace: navno
+  namespace: personbruker
   labels:
-    team: navno
+    team: personbruker
 spec:
     unleashInstance:
       apiVersion: unleash.nais.io/v1
       kind: RemoteUnleash
       name: navno
     secretName: nav-dekoratoren-unleash-api-token
-
-    # Specify which environment the API token should be created for.
-    # Can be one of: development, or production.
     environment: development
diff --git a/.nais/unleash/unleash-api-token.prod.yml → .nais/unleash/unleash-api-token.prod.yaml b/.nais/unleash/unleash-api-token.prod.yml → .nais/unleash/unleash-api-token.prod.yaml
@@ -2,9 +2,9 @@ apiVersion: unleash.nais.io/v1
 kind: ApiToken
 metadata:
   name: nav-dekoratoren
-  namespace: navno
+  namespace: personbruker
   labels:
-    team: navno
+    team: personbruker
 spec:
     unleashInstance:
       apiVersion: unleash.nais.io/v1

diff --git a/.nais/vars/dev-beta-navno.yaml b/.nais/vars/dev-beta-navno.yaml
@@ -4,6 +4,7 @@ ingresses:
   - https://dekoratoren-beta.intern.dev.nav.no
 outboundHosts:
   - portal-admin-q6.oera.no
+  - navno-unleash-api.nav.cloud.nais.io
 env:
   - name: ENV
     value: dev

diff --git a/.nais/vars/dev-beta-tms.yaml b/.nais/vars/dev-beta-tms.yaml
@@ -4,6 +4,7 @@ ingresses:
   - https://dekoratoren-beta-tms.intern.dev.nav.no
 outboundHosts:
   - portal-admin-dev.oera.no
+  - navno-unleash-api.nav.cloud.nais.io
 env:
   - name: ENV
     value: dev

diff --git a/.nais/vars/dev-stable.yaml b/.nais/vars/dev-stable.yaml
@@ -4,6 +4,7 @@ ingresses:
   - https://dekoratoren.ekstern.dev.nav.no
 outboundHosts:
   - portal-admin-dev.oera.no
+  - navno-unleash-api.nav.cloud.nais.io
 env:
   - name: ENV
     value: dev

diff --git a/.nais/vars/prod.yaml b/.nais/vars/prod.yaml
@@ -5,6 +5,7 @@ ingresses:
   - https://www.nav.no/dekoratoren
 outboundHosts:
   - www.nav.no
+  - navno-unleash-api.nav.cloud.nais.io
 env:
   - name: ENV
     value: prod

diff --git a/.prettierignore b/.prettierignore
@@ -2,3 +2,4 @@ webpack.client.config.js
 webpack.server.config.js
 package.json
 *.yml
+*.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ webpack.client.config.js @@
     webpack.server.config.js
     package.json
     *.yml
+    *.yaml