Merge pull request #3398 from navikt/feature/kodeverk-benytte-nytt-api

Endret kodeverk-proxy til å gå mot den nye kodeverk-api løsningen i gcp

apps/dolly-backend/config.test.yml

@@ -54,14 +54,14 @@ 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
  - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
  - host: testnav-pdl-proxy.dev-fss-pub.nais.io
  - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
  - host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
+ - host: kodeverk-api.nav.no
  - host: testnav-udistub-proxy.dev-fss-pub.nais.io
  - host: tps-forvalteren-dev-proxy.dev-fss-pub.nais.io
  webproxy: true

apps/dolly-backend/config.yml

@@ -61,9 +61,9 @@ 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: kodeverk-api.nav.no
  - host: testnav-norg2-proxy.dev-fss-pub.nais.io
  - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
  - host: testnav-pdl-proxy.dev-fss-pub.nais.io

apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java

@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
  SpringApplication.run(DollyBackendApplicationStarter.class, args);
  }
-}
+}

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;

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

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: https://kodeverk-api.nav.no
+ cluster: prod-gcp
  testnav-dokarkiv-proxy:
  name: testnav-dokarkiv-proxy
  namespace: dolly

apps/dolly-backend/src/test/resources/application-test.yaml

@@ -23,11 +23,11 @@ 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
+ cluster: prod-gcp
  testnav-tps-messaging-service:
  name: tps-messaging-mock
  namespace: dolly

apps/dolly-frontend/config.idporten.yml

@@ -50,12 +50,12 @@ spec:
  - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
  - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
  - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
+ - host: kodeverk-api.nav.no
  - host: testnav-udistub-proxy.dev-fss-pub.nais.io
  - host: testnav-inst-proxy.dev-fss-pub.nais.io
  - 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

apps/dolly-frontend/config.unstable.yml

@@ -56,11 +56,11 @@ spec:
  - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
  - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
  - host: testnav-udistub-proxy.dev-fss-pub.nais.io
+ - host: kodeverk-api.nav.no
  - host: testnav-inst-proxy.dev-fss-pub.nais.io
  - 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

apps/dolly-frontend/config.yml

@@ -65,8 +65,8 @@ 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: kodeverk-api.nav.no
  - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
  - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
  - host: testnav-norg2-proxy.dev-fss-pub.nais.io

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: https://kodeverk-api.nav.no
+ cluster: prod-gcp
  testnav-aareg-proxy:
  name: testnav-aareg-proxy
  namespace: dolly