Koble til ny database hentet fra backup (#350)

navikt · Jun 20, 2024 · 397169b · 397169b
1 parent 466ba1f
commit 397169b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/.nais/feature.yaml b/.nais/feature.yaml
@@ -30,6 +30,7 @@ azure:
   unsecure:
     ereg_url: ereg-services.dev-fss-pub.nais.io
 dbname: bidrag-grunnlag-feature
+dbinstancename: bidrag-grunnlag-feature-2
 azureAccessInbound:
   - application: bisys
     namespace: bidrag
@@ -48,4 +49,5 @@ spec:
     min: 1
   gcp:
     sqlInstances:
+      diskSize: 10
       tier: db-f1-micro
diff --git a/.nais/main.yaml b/.nais/main.yaml
@@ -30,6 +30,7 @@ azure:
   unsecure:
     ereg_url: ereg-services.dev-fss-pub.nais.io
 dbname: bidrag-grunnlag-main
+dbinstancename: bidrag-grunnlag-main-4
 azureAccessInbound:
   - application: bisys
     namespace: bidrag
@@ -48,4 +49,5 @@ spec:
     min: 2
   gcp:
     sqlInstances:
+      diskSize: 15
       tier: db-f1-micro
diff --git a/.nais/nais.yaml b/.nais/nais.yaml
@@ -107,8 +107,9 @@ spec:
       value: {{ azure.bidrag_organisasjon_scope }}
   gcp:
     sqlInstances:
-      - name: {{ dbname }}
+      - name: {{ dbinstancename }}
         type: POSTGRES_14
+        diskSize: {{ spec.gcp.sqlInstances.diskSize }}
         databases:
           - name: {{ dbname }}
             envVarPrefix: DB

diff --git a/.nais/prod.yaml b/.nais/prod.yaml
@@ -31,6 +31,7 @@ azure:
   unsecure:
     ereg_url: ereg-services.prod-fss-pub.nais.io
 dbname: bidrag-grunnlag-prod
+dbinstancename: bidrag-grunnlag-prod-3
 azureAccessInbound:
   - application: bisys
     namespace: bidrag
@@ -46,4 +47,5 @@ spec:
     min: 2
   gcp:
     sqlInstances:
+      diskSize: 20
       tier: db-custom-1-3840
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -121,13 +121,19 @@ spring:
   config.activate.on-profile: live
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_DATABASE}?user=${DB_USERNAME}&password=${DB_PASSWORD}
+    url: ${DB_JDBC_URL}
     hikari:
       idle-timeout: 10001
       max-lifetime: 30001
       connectionTimeout: 1000
       maximum-pool-size: 10
       minimum-idle: 1
+      data-source-properties:
+        ssl: true
+        sslmode: ${DB_SSLMODE}
+        sslcert: ${DB_SSLCERT}
+        sslkey: ${DB_SSLKEY_PK8}
+        sslrootcert: ${DB_SSLROOTCERT}
   flyway:
     enabled: true
     locations: classpath:/db/migration