From 3ffd91b9f626fb5f981b1312cc5e148c70d1bea0 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Tue, 10 Sep 2024 22:14:11 +0200 Subject: [PATCH] change/gcp-postgres-15 (#3611) Bump GCP PSQL to POSTGRES_15. --- apps/app-tilgang-analyse-service/config.yml | 2 +- .../src/test/resources/application-test.yml | 2 +- apps/bruker-service/config.test.yml | 2 +- apps/bruker-service/config.yml | 2 +- apps/dolly-backend/config.test.yml | 2 +- apps/dolly-backend/config.yml | 2 +- .../src/test/resources/application-test.yaml | 4 +-- .../config.yml | 2 +- apps/inntektsmelding-service/config.yml | 2 +- .../src/main/resources/ArbeidKodeverk | 28 ------------------- .../config.yml | 2 +- .../config.yml | 2 +- apps/organisasjon-forvalter/config.yml | 2 +- apps/orgnummer-service/config.yml | 2 +- apps/pdl-forvalter/config.test.yml | 2 +- apps/pdl-forvalter/config.yml | 2 +- apps/person-faste-data-service/config.yml | 2 +- apps/testnav-ident-pool/config.yml | 2 +- .../src/test/resources/application-test.yml | 2 +- apps/varslinger-service/config.test.yml | 2 +- apps/varslinger-service/config.yml | 2 +- 21 files changed, 21 insertions(+), 49 deletions(-) delete mode 100644 apps/levende-arbeidsforhold-ansettelse/src/main/resources/ArbeidKodeverk diff --git a/apps/app-tilgang-analyse-service/config.yml b/apps/app-tilgang-analyse-service/config.yml index dc9947a1044..70f3bf95994 100644 --- a/apps/app-tilgang-analyse-service/config.yml +++ b/apps/app-tilgang-analyse-service/config.yml @@ -25,7 +25,7 @@ spec: - host: api.github.com gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-app-tilgang-analyse-service-db diff --git a/apps/brreg-stub/src/test/resources/application-test.yml b/apps/brreg-stub/src/test/resources/application-test.yml index 064f9583bce..e76cddc54d0 100644 --- a/apps/brreg-stub/src/test/resources/application-test.yml +++ b/apps/brreg-stub/src/test/resources/application-test.yml @@ -6,7 +6,7 @@ spring: database: enabled: false datasource: - url: jdbc:tc:postgresql:12:///test_database + url: jdbc:tc:postgresql:15:///test_database username: user password: password jpa: diff --git a/apps/bruker-service/config.test.yml b/apps/bruker-service/config.test.yml index 598ade83107..713f06a5a78 100644 --- a/apps/bruker-service/config.test.yml +++ b/apps/bruker-service/config.test.yml @@ -55,7 +55,7 @@ spec: max: 1 gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-bruker-service-dev-db diff --git a/apps/bruker-service/config.yml b/apps/bruker-service/config.yml index 75d533d2048..58cdf65a2d3 100644 --- a/apps/bruker-service/config.yml +++ b/apps/bruker-service/config.yml @@ -51,7 +51,7 @@ spec: path: /internal/metrics gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-bruker-service-db diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml index 751dcee035f..9e6d7432f6f 100644 --- a/apps/dolly-backend/config.test.yml +++ b/apps/dolly-backend/config.test.yml @@ -111,7 +111,7 @@ spec: memory: 2048Mi gcp: sqlInstances: - - type: POSTGRES_14 + - type: POSTGRES_15 tier: db-custom-1-3840 name: testnav-dolly-backend-dev databases: diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml index 9139622a4c0..098dc698b9c 100644 --- a/apps/dolly-backend/config.yml +++ b/apps/dolly-backend/config.yml @@ -112,7 +112,7 @@ spec: memory: 8192Mi gcp: sqlInstances: - - type: POSTGRES_14 + - type: POSTGRES_15 tier: db-custom-2-7680 name: testnav-dolly-backend databases: diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yaml index a5d626fddd4..8226fcfb4e4 100644 --- a/apps/dolly-backend/src/test/resources/application-test.yaml +++ b/apps/dolly-backend/src/test/resources/application-test.yaml @@ -92,11 +92,11 @@ spring: enabled: false datasource: type: org.springframework.jdbc.datasource.SimpleDriverDataSource - url: jdbc:tc:postgresql:14.4:///dollyDB?TC_REUSABLE=true # 14.4 er versjon p.t. i dev-gcp. + url: jdbc:tc:postgresql:15:///dollyDB?TC_REUSABLE=true username: user password: pass flyway: enabled: true - url: jdbc:tc:postgresql:14.4:///dollyDB?TC_REUSABLE=true # 14.4 er versjon p.t. i dev-gcp. + url: jdbc:tc:postgresql:15:///dollyDB?TC_REUSABLE=true user: user password: pass \ No newline at end of file diff --git a/apps/generer-organisasjon-populasjon-service/config.yml b/apps/generer-organisasjon-populasjon-service/config.yml index 431c378c583..00ebbf3891d 100644 --- a/apps/generer-organisasjon-populasjon-service/config.yml +++ b/apps/generer-organisasjon-populasjon-service/config.yml @@ -30,7 +30,7 @@ spec: - application: testnav-orgnummer-service gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-generer-organisasjon-populasjon-db diff --git a/apps/inntektsmelding-service/config.yml b/apps/inntektsmelding-service/config.yml index fb14fb0e7e5..cbc9958281d 100644 --- a/apps/inntektsmelding-service/config.yml +++ b/apps/inntektsmelding-service/config.yml @@ -34,7 +34,7 @@ spec: - host: testnav-inntektsmelding-generator-service.intern.dev.nav.no gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-inntektsmelding-service-db diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/ArbeidKodeverk b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/ArbeidKodeverk deleted file mode 100644 index 01b41b6f1c8..00000000000 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/ArbeidKodeverk +++ /dev/null @@ -1,28 +0,0 @@ -export enum ArbeidKodeverk { - Yrker = 'Yrker', - Arbeidstidsordninger = 'Arbeidstidsordninger', - Arbeidsforholdstyper = 'Arbeidsforholdstyper', - Avloenningstyper = 'Avlønningstyper', - PermisjonsOgPermitteringsBeskrivelse = 'PermisjonsOgPermitteringsBeskrivelse', - SluttaarsakAareg = 'SluttårsakAareg', - AnsettelsesformAareg = 'AnsettelsesformAareg', - Skipsregistre = 'Skipsregistre', - Skipstyper = 'Skipstyper', - Fartsomraader = 'Fartsområder', - Valutaer = 'Valutaer', -}nais login - -gcp: - sqlInstances: - - type: POSTGRES_14 - name: testnav-levende-arbeidsforhold-ansettelse - databases: - - name: ansettelse-jobber - autoBackupHour: 3 #Lager backup av hele SQL instancen hver dag kl 03:00 - tier: db-f1-micro - diskAutoresize: true #Kanskje ikke nødvendig? - #collation: DESC - - url: jdbc:postgresql://${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_ANSETTELSE_LEVENDE_ARBEIDSFORHOLD_DB_HOST}:${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_ANSETTELSE_LEVENDE_ARBEIDSFORHOLD_DB_PORT}/${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_ANSETTELSE_LEVENDE_ARBEIDSFORHOLD_DB_DATABASE}?user=${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_ANSETTELSE_LEVENDE_ARBEIDSFORHOLD_DB_USERNAME}&password=${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_ANSETTELSE_LEVENDE_ARBEIDSFORHOLD_DB_PASSWORD}&sslcert=${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_ANSETTELSE_LEVENDE_ARBEIDSFORHOLD_DB_SSLCERT} - -{andreSkift=Andre skift, skift365=Skiftarbeid (36,5 t/u), ikkeSkift=Ikke skift, offshore336=Arbeid offshore (33,6 t/u), doegnkontinuerligSkiftOgTurnus355=Døgnkontinuerlig skiftarbeid og turnusarbeid (35,5 t/u), helkontinuerligSkiftOgAndreOrdninger336=Helkontinuerlig skiftarbeid og andre ordninger med 33,6 t/u} diff --git a/apps/organisasjon-bestilling-service/config.yml b/apps/organisasjon-bestilling-service/config.yml index a7313ce10fa..def6bb55621 100644 --- a/apps/organisasjon-bestilling-service/config.yml +++ b/apps/organisasjon-bestilling-service/config.yml @@ -40,7 +40,7 @@ spec: - host: testnorge-batch-adeo-proxy.dev-fss-pub.nais.io gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: organisasjon-bestilling-db diff --git a/apps/organisasjon-faste-data-service/config.yml b/apps/organisasjon-faste-data-service/config.yml index be75f959266..7bef804a88d 100644 --- a/apps/organisasjon-faste-data-service/config.yml +++ b/apps/organisasjon-faste-data-service/config.yml @@ -40,7 +40,7 @@ spec: cluster: dev-gcp gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-organisasjon-faste-data-db diff --git a/apps/organisasjon-forvalter/config.yml b/apps/organisasjon-forvalter/config.yml index ce6ae1b001a..6d532c21743 100644 --- a/apps/organisasjon-forvalter/config.yml +++ b/apps/organisasjon-forvalter/config.yml @@ -45,7 +45,7 @@ spec: - application: testnav-tps-messaging-service gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: organisasjon-forvalter-db diff --git a/apps/orgnummer-service/config.yml b/apps/orgnummer-service/config.yml index 6323decf9d4..4c70e3d34bd 100644 --- a/apps/orgnummer-service/config.yml +++ b/apps/orgnummer-service/config.yml @@ -68,7 +68,7 @@ spec: - "https://testnav-orgnummer-service.intern.dev.nav.no" gcp: sqlInstances: - - type: POSTGRES_14 + - type: POSTGRES_15 tier: db-custom-1-3840 name: testnav-orgnummer-pool databases: diff --git a/apps/pdl-forvalter/config.test.yml b/apps/pdl-forvalter/config.test.yml index d7f4b37e3b5..ea619005a39 100644 --- a/apps/pdl-forvalter/config.test.yml +++ b/apps/pdl-forvalter/config.test.yml @@ -74,7 +74,7 @@ spec: - host: testnav-pdl-proxy.dev-fss-pub.nais.io gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-pdl-forvalter-dev-db diff --git a/apps/pdl-forvalter/config.yml b/apps/pdl-forvalter/config.yml index 7012ce67b4e..d1a5607d88c 100644 --- a/apps/pdl-forvalter/config.yml +++ b/apps/pdl-forvalter/config.yml @@ -72,7 +72,7 @@ spec: - host: testnav-pdl-proxy.dev-fss-pub.nais.io gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-pdl-forvalter-db diff --git a/apps/person-faste-data-service/config.yml b/apps/person-faste-data-service/config.yml index 2ff4ccaaf02..a95eb1d000b 100644 --- a/apps/person-faste-data-service/config.yml +++ b/apps/person-faste-data-service/config.yml @@ -28,7 +28,7 @@ spec: cluster: dev-fss gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-person-faste-data-db diff --git a/apps/testnav-ident-pool/config.yml b/apps/testnav-ident-pool/config.yml index 9aff0e9aa7d..6d14251cccb 100644 --- a/apps/testnav-ident-pool/config.yml +++ b/apps/testnav-ident-pool/config.yml @@ -68,7 +68,7 @@ spec: cluster: dev-gcp gcp: sqlInstances: - - type: POSTGRES_14 + - type: POSTGRES_15 tier: db-custom-1-3840 name: testnav-identpool databases: diff --git a/apps/udi-stub/src/test/resources/application-test.yml b/apps/udi-stub/src/test/resources/application-test.yml index 7e72df27c24..123ac8aa009 100644 --- a/apps/udi-stub/src/test/resources/application-test.yml +++ b/apps/udi-stub/src/test/resources/application-test.yml @@ -6,7 +6,7 @@ spring: token: "test" enabled: false datasource: - url: jdbc:tc:postgresql:14.4:///test?TC_REUSABLE=true # 14.4 er versjon p.t. i dev-gcp. + url: jdbc:tc:postgresql:15:///test?TC_REUSABLE=true username: user password: pass jpa: diff --git a/apps/varslinger-service/config.test.yml b/apps/varslinger-service/config.test.yml index 41aa126c75c..a4d04cf93e2 100644 --- a/apps/varslinger-service/config.test.yml +++ b/apps/varslinger-service/config.test.yml @@ -25,7 +25,7 @@ spec: tenant: nav.no gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-varslinger-db-dev diff --git a/apps/varslinger-service/config.yml b/apps/varslinger-service/config.yml index fb6738eaef6..f22f2183c72 100644 --- a/apps/varslinger-service/config.yml +++ b/apps/varslinger-service/config.yml @@ -26,7 +26,7 @@ spec: tenant: nav.no gcp: sqlInstances: - - type: POSTGRES_12 + - type: POSTGRES_15 tier: db-custom-1-3840 databases: - name: testnav-varslinger-db