fixes for kubernetes deployment

saveourtool · Mar 6, 2024 · cb4150a · cb4150a
1 parent 0b49709
commit cb4150a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 deletions.
diff --git a/api-gateway/build.gradle.kts b/api-gateway/build.gradle.kts
@@ -9,7 +9,9 @@ dependencies {
     implementation(libs.spring.cloud.starter.gateway)
     implementation(libs.spring.boot.starter.security)
     implementation(libs.spring.boot.starter.oauth2.client)
-    implementation(libs.spring.cloud.starter.kubernetes.client.config)
+    implementation(libs.spring.cloud.starter.kubernetes.client.config) {
+        because("needed for kubernetes configs and secrets to be added as additional configurations")
+    }
     implementation(libs.spring.security.core)
     implementation(projects.authenticationService)
 

diff --git a/cosv-backend/src/main/resources/application-kubernetes.properties b/cosv-backend/src/main/resources/application-kubernetes.properties
@@ -10,8 +10,8 @@ server.shutdown=graceful
 management.endpoints.web.exposure.include=*
 management.server.port=5701
 spring.datasource.url=${spring.datasource.backend-cosv-url}
-spring.second-datasource.jdbc-url = ${spring.datasource.backend-url}
-spring.second-datasource.username = ${spring.datasource.username}
-spring.second-datasource.password = ${spring.datasource.password}
+spring.second-datasource.jdbc-url=${spring.datasource.backend-url}
+spring.second-datasource.username=${spring.datasource.username}
+spring.second-datasource.password=${spring.datasource.password}
 logging.level.org.springframework=DEBUG
 logging.level.com.saveourtool=DEBUG
diff --git a/save-backend/build.gradle.kts b/save-backend/build.gradle.kts
@@ -53,7 +53,9 @@ dependencies {
     implementation(libs.spring.boot.starter.security)
     implementation(libs.spring.security.core)
     implementation(libs.hibernate.micrometer)
-    implementation(libs.spring.cloud.starter.kubernetes.client.config)
+    implementation(libs.spring.cloud.starter.kubernetes.client.config) {
+        because("needed for kubernetes configs and secrets to be added as additional configurations")
+    }
     implementation(libs.reactor.extra)
     implementation(libs.arrow.kt.core)
     implementation(project.dependencies.platform(libs.aws.sdk.bom))

diff --git a/save-cloud-charts/save-cloud/templates/backend-cosv.yaml b/save-cloud-charts/save-cloud/templates/backend-cosv.yaml
@@ -117,7 +117,7 @@ spec:
               name: migrations-data
             - mountPath: {{ .Values.mysql.dbPasswordFile }}
               name: database-secret
-            {{ if .Values.gateway.initCerts.enabled }}
+            {{ if .Values.initCerts.enabled }}
             - name: ca-pemstore
               mountPath: /etc/ssl/certs/ca-certificates.crt
               subPath: ca-certificates.crt
@@ -133,7 +133,7 @@ spec:
             secretName: s3-secrets
         - name: migrations-data
           emptyDir: {}
-        {{ if .Values.gateway.initCerts.enabled }}
+        {{ if .Values.initCerts.enabled }}
         - name: ca-pemstore
           configMap:
             name: ca-pemstore

diff --git a/save-cloud-charts/save-cloud/templates/backend.yaml b/save-cloud-charts/save-cloud/templates/backend.yaml
@@ -117,7 +117,7 @@ spec:
               name: migrations-data
             - mountPath: {{ .Values.mysql.dbPasswordFile }}
               name: database-secret
-            {{ if .Values.gateway.initCerts.enabled }}
+            {{ if .Values.initCerts.enabled }}
             - name: ca-pemstore
               mountPath: /etc/ssl/certs/ca-certificates.crt
               subPath: ca-certificates.crt
@@ -133,7 +133,7 @@ spec:
             secretName: s3-secrets
         - name: migrations-data
           emptyDir: {}
-        {{ if .Values.gateway.initCerts.enabled }}
+        {{ if .Values.initCerts.enabled }}
         - name: ca-pemstore
           configMap:
             name: ca-pemstore

diff --git a/save-cloud-charts/save-cloud/templates/gateway.yaml b/save-cloud-charts/save-cloud/templates/gateway.yaml
@@ -39,7 +39,7 @@ spec:
               name: cacerts
             - mountPath: /home/cnb/secrets/oauth
               name: oauth-credentials
-      {{ if .Values.gateway.initCerts.enabled }}
+      {{ if .Values.initCerts.enabled }}
       initContainers:
         - name: init-cacerts
           image: ghcr.io/saveourtool/api-gateway:0.4.0-alpha.0.408-9b56d61

diff --git a/save-demo/build.gradle.kts b/save-demo/build.gradle.kts
@@ -30,7 +30,9 @@ dependencies {
     api(projects.saveCloudCommon)
     implementation(libs.save.common.jvm)
 
-    implementation(libs.spring.cloud.starter.kubernetes.client.config)
+    implementation(libs.spring.cloud.starter.kubernetes.client.config) {
+        because("needed for kubernetes configs and secrets to be added as additional configurations")
+    }
 
     api(libs.ktor.client.auth)
     implementation(libs.ktor.client.core)

diff --git a/save-orchestrator/build.gradle.kts b/save-orchestrator/build.gradle.kts
@@ -22,7 +22,9 @@ dependencies {
     implementation(libs.commons.compress)
     implementation(libs.kotlinx.datetime)
     implementation(libs.zip4j)
-    implementation(libs.spring.cloud.starter.kubernetes.client.config)
+    implementation(libs.spring.cloud.starter.kubernetes.client.config) {
+        because("needed for kubernetes configs and secrets to be added as additional configurations")
+    }
     implementation(libs.fabric8.kubernetes.client) {
         exclude("org.slf4j", "slf4j-api")
     }