Merge pull request #1192 from navikt/q2

Q2
navikt · Aug 23, 2024 · a808e1b · a808e1b
2 parents 562220a + d1aa974
commit a808e1b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/deploy/dev.yaml b/deploy/dev.yaml
@@ -5,17 +5,17 @@ externalHosts:
   - host: hooks.slack.com
   - host: klage-fss-proxy.dev-fss-pub.nais.io
   - host: kafka-schema-registry.nais-q.adeo.no
-  - host: saf.dev-fss-pub.nais.io
-  - host: norg2.dev-fss-pub.nais.io
-  - host: ereg-services-q1.dev-fss-pub.nais.io
-  - host: arbeid-og-inntekt-q1.dev-fss-pub.nais.io
-  - host: nom-api.intern.dev.nav.no
-  - host: pdl-api.dev-fss-pub.nais.io
-  - host: digdir-krr-proxy.intern.dev.nav.no
-  - host: kodeverk-api.nav.no
-  - host: regoppslag.dev-fss-pub.nais.io
-  - host: dokdistkanal-q1.dev-fss-pub.nais.io
-  - host: dokarkiv.dev-fss-pub.nais.io
+  - host: saf-q2.dev-fss-pub.nais.io
+  - host: norg2.dev-fss-pub.nais.io #Ingen forskjeller miljø
+  - host: ereg-services-q2.dev-fss-pub.nais.io
+  - host: arbeid-og-inntekt-q2.dev-fss-pub.nais.io
+  - host: nom-api.intern.dev.nav.no #Ingen forskjeller miljø
+  - host: pdl-api.dev-fss-pub.nais.io #Bruker allerede q2
+  - host: digdir-krr-proxy.intern.dev.nav.no #Ingen forskjeller miljø
+  - host: kodeverk-api.intern.dev.nav.no
+  - host: regoppslag.dev-fss-pub.nais.io #Bruker allerede q2
+  - host: dokdistkanal-q2.dev-fss-pub.nais.io
+  - host: dokarkiv-q2.dev-fss-pub.nais.io
 inboundApplications:
   - application: kabal-frontend
   - application: klage-dittnav-api

diff --git a/src/main/resources/application-dev-gcp.yml b/src/main/resources/application-dev-gcp.yml
@@ -9,12 +9,12 @@ PROXY_APP_CLIENT_ID: c6050231-3b9f-4173-8d1e-39b7e6e3392e
 REGOPPSLAG_URL: https://regoppslag.dev-fss-pub.nais.io
 REGOPPSLAG_SCOPE: dev-fss.teamdokumenthandtering.regoppslag
 
-EREG_URL: https://ereg-services-q1.dev-fss-pub.nais.io/api/v2
+EREG_URL: https://ereg-services-q2.dev-fss-pub.nais.io/api/v2
 
-DOK_DIST_KANAL_URL: https://dokdistkanal-q1.dev-fss-pub.nais.io
-DOK_DIST_KANAL_SCOPE: dev-fss.teamdokumenthandtering.dokdistkanal-q1
+DOK_DIST_KANAL_URL: https://dokdistkanal-q2.dev-fss-pub.nais.io
+DOK_DIST_KANAL_SCOPE: dev-fss.teamdokumenthandtering.dokdistkanal
 
-KODEVERK_API_URL: https://kodeverk-api.nav.no/api/v1/kodeverk
+KODEVERK_API_URL: https://kodeverk-api.intern.dev.nav.no/api/v1/kodeverk
 KODEVERK_SCOPE: dev-gcp.team-rocket.kodeverk-api
 
 VEDTAK_FATTET_TOPIC: klage.vedtak-fattet.v1
@@ -33,19 +33,19 @@ AIVEN_ES_USE_SSL: true
 NOM_BASE_URL: https://nom-api.intern.dev.nav.no/graphql
 NOM_SCOPE: dev-gcp.nom.nom-api
 
-SAF_BASE_URL: https://saf.dev-fss-pub.nais.io/
-SAF_SCOPE: dev-fss.teamdokumenthandtering.saf-q1
+SAF_BASE_URL: https://saf-q2.dev-fss-pub.nais.io/
+SAF_SCOPE: dev-fss.teamdokumenthandtering.saf
 
-DOKARKIV_SCOPE: dev-fss.teamdokumenthandtering.dokarkiv-q1/
-DOKARKIV_BASE_URL: https://dokarkiv.dev-fss-pub.nais.io/rest/journalpostapi/v1
+DOKARKIV_SCOPE: dev-fss.teamdokumenthandtering.dokarkiv/
+DOKARKIV_BASE_URL: https://dokarkiv-q2.dev-fss-pub.nais.io/rest/journalpostapi/v1
 
 CLAM_AV_URL: http://clamav.nais-system/scan
 
 FERDIGSTILLE_DOKUMENTER_DELAY_MILLIS: 20000
 
 KAKA_VERSION_2_DATE: 2022-12-20
 
-ARBEID_OG_INNTEKT_URL: https://arbeid-og-inntekt-q1.dev-fss-pub.nais.io/
+ARBEID_OG_INNTEKT_URL: https://arbeid-og-inntekt-q2.dev-fss-pub.nais.io/
 
 KLAGE_FSS_PROXY_URL: https://klage-fss-proxy.dev-fss-pub.nais.io
 

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -312,8 +312,6 @@ PDL_PERSON_KAFKA_TOPIC: aapen-person-pdl-dokument-v1
 INTERNAL_BEHANDLING_EVENT_TOPIC: klage.internal-behandling-events.v1
 INTERNAL_IDENTITY_EVENT_TOPIC: klage.internal-identity-events.v1
 
-JOARK_DOCUMENT_TOPIC: teamdokumenthandtering.aapen-dok-journalfoering-q1
-
 SERVICE_USER_PASSWORD: itest
 
 KABAL_DOCUMENT_BASE_URL: http://kabal-document