Fjernet kodeverkproxy og endret til at appene henter hver for seg

#deploy-test-dolly-backend
navikt · Jan 24, 2024 · 51a89c5 · 51a89c5
1 parent 24f0065
commit 51a89c5
Show file tree

Hide file tree

Showing 27 changed files with 25 additions and 732 deletions.
diff --git a/.github/workflows/proxy.kodeverk-proxy.yml b/.github/workflows/proxy.kodeverk-proxy.yml
diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
@@ -46,6 +46,8 @@ spec:
         - application: testnav-miljoer-service
         - application: testnav-inntektsmelding-service
         - application: testnav-arbeidsforhold-service
+        - application: kodeverk-api
+          namespace: team-rocket
       external:
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-brregstub-proxy.dev-fss-pub.nais.io
@@ -54,7 +56,6 @@ spec:
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-kontoregister-person-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -53,6 +53,8 @@ spec:
         - application: testnav-miljoer-service
         - application: testnav-inntektsmelding-service
         - application: testnav-arbeidsforhold-service
+        - application: kodeverk-api
+          namespace: team-rocket
       external:
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-brregstub-proxy.dev-fss-pub.nais.io
@@ -61,7 +63,6 @@ spec:
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-kontoregister-person-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java
@@ -34,7 +34,7 @@ public class Consumers {
     private ServerProperties testnavInntektsmeldingService;
     private ServerProperties testnavInntektstubProxy;
     private ServerProperties testnavInstProxy;
-    private ServerProperties testnavKodeverkProxy;
+    private ServerProperties kodeverkApi;
     private ServerProperties testnavKontoregisterPersonProxy;
     private ServerProperties testnavKrrstubProxy;
     private ServerProperties testnavMedlProxy;

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkConsumer.java
@@ -48,7 +48,7 @@ public KodeverkConsumer(
             WebClient.Builder webClientBuilder
     ) {
         this.tokenService = tokenService;
-        serverProperties = consumers.getTestnavKodeverkProxy();
+        serverProperties = consumers.getKodeverkApi();
         this.webClient = webClientBuilder
                 .exchangeStrategies(
                         ExchangeStrategies

diff --git a/apps/dolly-backend/src/main/resources/application.yaml b/apps/dolly-backend/src/main/resources/application.yaml
@@ -123,11 +123,11 @@ consumers:
     namespace: dolly
     url: http://testnav-person-service.dolly.svc.cluster.local
     cluster: dev-gcp
-  testnav-kodeverk-proxy:
-    name: testnav-kodeverk-proxy
-    namespace: dolly
-    url: https://testnav-kodeverk-proxy.dev-fss-pub.nais.io
-    cluster: dev-fss
+  kodeverk-api:
+    name: kodeverk-api
+    namespace: team-rocket
+    url: http://kodeverk-api.team-rocket.svc.cluster.local
+    cluster: dev-gcp
   testnav-dokarkiv-proxy:
     name: testnav-dokarkiv-proxy
     namespace: dolly

diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yaml
@@ -23,9 +23,9 @@ open:
     index: dummy
 
 consumers:
-  testnav-kodeverk-proxy:
-    name: kodeverk-mock
-    namespace: dolly
+  kodeverk-api:
+    name: kodeverk-api
+    namespace: team-rocket
     url: http://localhost:${wiremock.server.port:0}/kodeverk
     cluster: dev-fss
   testnav-tps-messaging-service:

diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
@@ -46,6 +46,8 @@ spec:
         - application: dolly-backend
         - application: testnav-person-service
         - application: generer-navn-service
+        - application: kodeverk-api
+          namespace: team-rocket
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
@@ -55,7 +57,6 @@ spec:
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml
@@ -51,6 +51,8 @@ spec:
         - application: testnav-miljoer-service
         - application: testnav-adresse-service
         - application: testnorge-tilbakemelding-api
+        - application: kodeverk-api
+          namespace: team-rocket
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
@@ -60,7 +62,6 @@ spec:
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
@@ -56,6 +56,8 @@ spec:
         - application: testnav-miljoer-service
         - application: testnav-adresse-service
         - application: testnorge-tilbakemelding-api
+        - application: kodeverk-api
+          namespace: team-rocket
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
@@ -65,7 +67,6 @@ spec:
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io

diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
@@ -63,11 +63,11 @@ consumers:
     url: https://krr-stub-%s.dev.intern.nav.no/api
   synthdata-aareg:
     url: http://nais-synthdata-aareg.dolly.svc.nais.local
-  kodeverk:
-    cluster: dev-fss
-    name: testnav-kodeverk-proxy
-    namespace: dolly
-    url: https://kodeverk.dev.intern.nav.no
+  kodeverk-api:
+    name: kodeverk-api
+    namespace: team-rocket
+    url: http://kodeverk-api.team-rocket.svc.cluster.local
+    cluster: dev-gcp
   testnav-aareg-proxy:
     name: testnav-aareg-proxy
     namespace: dolly

diff --git a/proxies/kodeverk-proxy/Dockerfile b/proxies/kodeverk-proxy/Dockerfile
diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle
diff --git a/proxies/kodeverk-proxy/config.yml b/proxies/kodeverk-proxy/config.yml
diff --git a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.jar b/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.jar
diff --git a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties