From 7bffcbaaaab2a192ca3ebd847431ec03d59f554d Mon Sep 17 00:00:00 2001
From: s148719 <jan.kjetil.skar@nav.no>
Date: Mon, 6 Nov 2023 13:07:33 +0100
Subject: [PATCH] Postgres 15

---
 .nais/feature.yaml                                              | 2 +-
 .nais/main.yaml                                                 | 2 +-
 .nais/nais.yaml                                                 | 2 +-
 .nais/prod.yaml                                                 | 2 +-
 docker-compose.yaml                                             | 2 +-
 src/test/kotlin/no/nav/bidrag/behandling/TestContainerRunner.kt | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.nais/feature.yaml b/.nais/feature.yaml
index c38b26335..42aaa1743 100644
--- a/.nais/feature.yaml
+++ b/.nais/feature.yaml
@@ -31,7 +31,7 @@ azure_access_inbound:
     cluster: dev-gcp
 database:
   dbname: bidrag-behandling-feature
-  autoResize: false
+  autoResize: true
   tier: db-f1-micro
 outbound-access-apps:
   - bidrag-beregn-forskudd-rest-feature
diff --git a/.nais/main.yaml b/.nais/main.yaml
index 3f9cbb996..2d54b27d0 100644
--- a/.nais/main.yaml
+++ b/.nais/main.yaml
@@ -31,7 +31,7 @@ azure_access_inbound:
     cluster: dev-gcp
 database:
   dbname: bidrag-behandling-main
-  autoResize: false
+  autoResize: true
   tier: db-f1-micro
 outbound-access-apps:
   - bidrag-beregn-forskudd-rest
diff --git a/.nais/nais.yaml b/.nais/nais.yaml
index 71ec450d4..05a78ef89 100644
--- a/.nais/nais.yaml
+++ b/.nais/nais.yaml
@@ -66,7 +66,7 @@ spec:
   gcp:
     sqlInstances:
       - name: {{ database.dbname }}
-        type: POSTGRES_14
+        type: POSTGRES_15
         diskAutoresize: {{ database.autoResize }}
         tier: {{ database.tier }}
         databases:
diff --git a/.nais/prod.yaml b/.nais/prod.yaml
index 773b1874e..0cddb9e67 100644
--- a/.nais/prod.yaml
+++ b/.nais/prod.yaml
@@ -30,7 +30,7 @@ azure_access_inbound:
     cluster: prod-gcp
 database:
   dbname: bidrag-behandling
-  autoResize: false
+  autoResize: true
   tier: db-custom-1-3840
 outbound-access-apps:
   - bidrag-beregn-forskudd-rest
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c13292289..df96d333b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   database:
-    image: postgres:14.5
+    image: postgres:15.4-alpine
     ports:
       - "5445:5432"
     environment:
diff --git a/src/test/kotlin/no/nav/bidrag/behandling/TestContainerRunner.kt b/src/test/kotlin/no/nav/bidrag/behandling/TestContainerRunner.kt
index 463861337..0d0d8df7a 100644
--- a/src/test/kotlin/no/nav/bidrag/behandling/TestContainerRunner.kt
+++ b/src/test/kotlin/no/nav/bidrag/behandling/TestContainerRunner.kt
@@ -15,7 +15,7 @@ class TestContainerRunner : SpringTestRunner() {
     companion object {
         @Container
         protected val postgreSqlDb =
-            PostgreSQLContainer("postgres:14.5").apply {
+            PostgreSQLContainer("postgres:15.4").apply {
                 withDatabaseName("bidrag-behandling")
                 withUsername("cloudsqliamuser")
                 withPassword("admin")