forbereder deploy til gcp (men ingen replicas)

config/gosys/prod-gcp.yml

@@ -0,0 +1,31 @@
+kafkaPool: nav-prod
+minReplicas: 0
+maxReplicas: 0
+azure:
+  enabled: true
+gcp:
+  type: POSTGRES_15
+  databaseName: spre-gosys
+  envVarPrefix: DB
+accessPolicy:
+  outbound:
+    - application: spre-gosys-pdf
+  external:
+    - dokarkiv.prod-fss-pub.nais.io
+    - ereg-services.prod-fss-pub.nais.io
+    - pdl-api.prod-fss-pub.nais.io
+env:
+  - name: KAFKA_MAX_RECORDS
+    value: "50"
+  - name: KAFKA_MAX_POLL_INTERVAL_MS
+    value: "500000"
+  - name: JOARK_BASE_URL
+    value: https://dokarkiv.prod-fss-pub.nais.io
+  - name: JOARK_SCOPE
+    value: api://prod-fss.teamdokumenthandtering.dokarkiv/.default
+  - name: EREG_BASE_URL
+    value: https://ereg-services.prod-fss-pub.nais.io
+  - name: PDL_BASE_URL
+    value: https://pdl-api.prod-fss-pub.nais.io
+  - name: PDL_CLIENT_SCOPE
+    value: api://prod-fss.pdl.pdl-api/.default

gosys/src/main/kotlin/no/nav/helse/spre/gosys/App.kt

@@ -38,7 +38,7 @@ internal val objectMapper: ObjectMapper = jacksonObjectMapper()
 internal val log: Logger = LoggerFactory.getLogger("spregosys")
 internal val sikkerLogg: Logger = LoggerFactory.getLogger("tjenestekall")
 
-val erUtvikling = System.getenv("NAIS_CLUSTER_NAME") == "dev-fss"
+val erUtvikling = System.getenv("NAIS_CLUSTER_NAME") == "dev-gcp"
 
 fun main() {
     val rapidsConnection = launchApplication(System.getenv())
@@ -62,37 +62,25 @@ fun launchApplication(
         install(HttpTimeout) { requestTimeoutMillis = 10000 }
     }
     val joarkClient = JoarkClient(environment.getValue("JOARK_BASE_URL"), azureClient, environment.getValue("JOARK_SCOPE"), httpClient)
-    val pdfBaseUrl = if (System.getenv("NAIS_CLUSTER_NAME") == "dev-gcp") {
-        "http://spre-gosys-pdf"
-    } else {
-        "http://spre-gosys-pdf.tbd.svc.nais.local"
-    }
-    val pdfClient = PdfClient(httpClient, pdfBaseUrl)
+    val pdfClient = PdfClient(httpClient, "http://spre-gosys-pdf")
     val eregClient = EregClient(environment.getValue("EREG_BASE_URL"), httpClient)
     val pdlClient = PdlClient(azureClient, httpClient, environment.getValue("PDL_BASE_URL"), environment.getValue("PDL_CLIENT_SCOPE"))
 
-    val dataSource = if (System.getenv("NAIS_CLUSTER_NAME") == "dev-gcp") {
-        val hikariConfig = HikariConfig().apply {
-            jdbcUrl = String.format("jdbc:postgresql://%s:%s/%s", environment.getValue("DB_HOST"), environment.getValue("DB_PORT"), environment.getValue("DB_DATABASE"))
-            username = environment.getValue("DB_USERNAME")
-            password = environment.getValue("DB_PASSWORD")
-            maximumPoolSize = 3
-            initializationFailTimeout = Duration.ofMinutes(30).toMillis()
-        }
-
-        val dataSource = HikariDataSource(hikariConfig)
-        Flyway.configure()
-            .dataSource(dataSource)
-            .lockRetryCount(-1)
-            .load()
-            .migrate()
-        dataSource
-    } else {
-        val dataSourceBuilder = DataSourceBuilder(readDatabaseEnvironment())
-        dataSourceBuilder.migrate()
-        dataSourceBuilder.getDataSource()
+    val hikariConfig = HikariConfig().apply {
+        jdbcUrl = String.format("jdbc:postgresql://%s:%s/%s", environment.getValue("DB_HOST"), environment.getValue("DB_PORT"), environment.getValue("DB_DATABASE"))
+        username = environment.getValue("DB_USERNAME")
+        password = environment.getValue("DB_PASSWORD")
+        maximumPoolSize = 3
+        initializationFailTimeout = Duration.ofMinutes(30).toMillis()
     }
 
+    val dataSource = HikariDataSource(hikariConfig)
+    Flyway.configure()
+        .dataSource(dataSource)
+        .lockRetryCount(-1)
+        .load()
+        .migrate()
+
     val duplikatsjekkDao = DuplikatsjekkDao(dataSource)
 
     val vedtakMediator = VedtakMediator(pdfClient, joarkClient, eregClient, pdlClient)