Merge pull request #1629 from navikt/postgres15

Bytt til postgres 15 for tester og preprod
navikt · Jan 9, 2024 · 0a495ea · 0a495ea
2 parents b31327e + 8212b85
commit 0a495ea
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ kjøre `./resetdb.sh`
 2. Legg inn følgende:
     ```
     # NAV POSTGRES PREPROD URL
-    10.183.160.87 b27dbvl009.preprod.local
+    10.183.160.87 b27dbvl030.preprod.local
     # NAV POSTGRES PROD URL
     10.53.20.112 A01DBVL011.adeo.no
     ```
@@ -49,7 +49,7 @@ Backup
     - eksempel for lokalt `pg_dump -U user -h localhost -p 5432 -F c supstonad-db-local > filnavn.dump`
         - password `pwd`
     - eksempel for
-      test `pg_dump -U brukernavnFraVault -h b27dbvl009.preprod.local -p 5432 -F c supstonad-db-dev > filnavn.dump`
+      test `pg_dump -U brukernavnFraVault -h b27dbvl030.preprod.local -p 5432 -F c supstonad-db-15-dev > filnavn.dump`
 
 Import
 
@@ -279,9 +279,9 @@ Denne vil opprette PRs en gang i uka på dependencies som ikke kjører siste ver
 2. Finner settings i `nais-dev.json` og `nais-prod.json`.
 3. Hent brukernavn/passord på https://vault.adeo.no/ui/vault/secrets (login med oidc). Åpne konsollen og velg ønsket
    rolle:
-    1. `vault read postgresql/preprod-fss/creds/supstonad-db-dev-readonly`
-    2. `vault read postgresql/preprod-fss/creds/supstonad-db-dev-user`
-    3. `vault read postgresql/preprod-fss/creds/supstonad-db-dev-admin`
+    1. `vault read postgresql/preprod-fss/creds/supstonad-db-15-dev-readonly`
+    2. `vault read postgresql/preprod-fss/creds/supstonad-db-15-dev-user`
+    3. `vault read postgresql/preprod-fss/creds/supstonad-db-15-dev-admin`
     4. `vault read postgresql/prod-fss/creds/supstonad-db-prod-readonly`
     5. `vault read postgresql/prod-fss/creds/supstonad-db-prod-user`
     6. `vault read postgresql/prod-fss/creds/supstonad-db-prod-admin`

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -101,7 +101,7 @@ subprojects {
             // select version() i preprod 2023-11-02 -> PostgreSQL 11.16 on x86_64-pc-linux-gnu, compiled by gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44), 64-bit
             // select version() i prod 2023-11-02 -> PostgreSQL 11.16 on x86_64-pc-linux-gnu, compiled by gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44), 64-bit
             // Merk at det ikke har blitt kompilert så mange drivere for denne: https://mvnrepository.com/artifact/io.zonky.test.postgres/embedded-postgres-binaries-darwin-arm64v8 og kun en versjon for postgres 11
-            enforcedPlatform("io.zonky.test.postgres:embedded-postgres-binaries-bom:11.15.0"),
+            enforcedPlatform("io.zonky.test.postgres:embedded-postgres-binaries-bom:15.5.1"),
         )
         testImplementation("io.zonky.test:embedded-postgres:2.0.6")
         // Legger til manglende binaries for nye Mac's med M1 cpuer.

diff --git a/datapakker/soknad/nais-dev.json b/datapakker/soknad/nais-dev.json
@@ -4,7 +4,7 @@
   "env": {
     "GCP_PROJECT": "supstonad-dev-0e48",
     "VAULT_MOUNTPATH": "postgresql/preprod-fss/",
-    "DATABASE_NAME": "supstonad-db-dev",
-    "DATABASE_JDBC_URL": "jdbc:postgresql://b27dbvl009.preprod.local:5432/supstonad-db-dev"
+    "DATABASE_NAME": "supstonad-db-15-dev",
+    "DATABASE_JDBC_URL": "jdbc:postgresql://b27dbvl030.preprod.local:5432/supstonad-db-15-dev"
   }
 }
diff --git a/local-db-scripts/dump_and_restore_from_dev.sh b/local-db-scripts/dump_and_restore_from_dev.sh
@@ -5,7 +5,7 @@ echo "skiv inn passord fra vault"
 read -r passord
 echo "Det vil sannsynligvis bli logget en del pg_restore errors - disse kan ignoreres"
 export PGPASSWORD="$passord"
-pg_dump -U "$username" -h b27dbvl009.preprod.local -p 5432 -F c supstonad-db-dev > data.dump
+pg_dump -U "$username" -h b27dbvl030.preprod.local -p 5432 -F c supstonad-db-15-dev > data.dump
 
 # user er username, og pwd er passord for den lokalt databasen
 export PGPASSWORD="pwd"

diff --git a/nais-dev.json b/nais-dev.json
@@ -11,8 +11,8 @@
     "AZURE_GROUP_SAKSBEHANDLER": "0ba009c4-d148-4a51-b501-4b1cf906889d",
     "AZURE_GROUP_DRIFT": "5ccd88bd-58d6-41a7-9652-5e0597b00f9b",
     "VAULT_MOUNTPATH": "postgresql/preprod-fss/",
-    "DATABASE_NAME": "supstonad-db-dev",
-    "DATABASE_JDBC_URL": "jdbc:postgresql://b27dbvl009.preprod.local:5432/supstonad-db-dev",
+    "DATABASE_NAME": "supstonad-db-15-dev",
+    "DATABASE_JDBC_URL": "jdbc:postgresql://b27dbvl030.preprod.local:5432/supstonad-db-15-dev",
     "DOKARKIV_URL": "http://dokarkiv.teamdokumenthandtering.svc.nais.local",
     "OPPGAVE_URL": "http://oppgave.oppgavehandtering.svc.nais.local",
     "OPPGAVE_CLIENT_ID": "41ca50ba-e44f-4bc8-9e31-b745a0041926",