diff --git a/controllers/tas/deployment.go b/controllers/tas/deployment.go index 516808a..4d95740 100644 --- a/controllers/tas/deployment.go +++ b/controllers/tas/deployment.go @@ -74,13 +74,13 @@ func (r *TrustyAIServiceReconciler) createDeploymentObject(ctx context.Context, } if instance.Spec.Storage.IsStorageDatabase() { - _, err := r.getSecret(ctx, instance.Name+"-db-tls", instance.Namespace) + _, err := r.getSecret(ctx, instance.Name+"-db-ca", instance.Namespace) if err != nil { deploymentConfig.UseDBTLSCerts = false - log.FromContext(ctx).Info("Using insecure database connection. Certificates " + instance.Name + "-db-tls not found") + log.FromContext(ctx).Info("Using insecure database connection. Certificates " + instance.Name + "-db-ca not found") } else { deploymentConfig.UseDBTLSCerts = true - log.FromContext(ctx).Info("Using secure database connection with certificates " + instance.Name + "-db-tls") + log.FromContext(ctx).Info("Using secure database connection with certificates " + instance.Name + "-db-ca") } } else { deploymentConfig.UseDBTLSCerts = false diff --git a/controllers/tas/templates/service/deployment.tmpl.yaml b/controllers/tas/templates/service/deployment.tmpl.yaml index e87091c..9257b69 100644 --- a/controllers/tas/templates/service/deployment.tmpl.yaml +++ b/controllers/tas/templates/service/deployment.tmpl.yaml @@ -100,7 +100,7 @@ spec: key: databaseName - name: QUARKUS_DATASOURCE_JDBC_URL {{ if .UseDBTLSCerts }} - value: "jdbc:${QUARKUS_DATASOURCE_DB_KIND}://${DATABASE_SERVICE}:${DATABASE_PORT}/${DATABASE_NAME}?sslMode=verify-ca&serverSslCert=/etc/tls/db/tls.crt" + value: "jdbc:${QUARKUS_DATASOURCE_DB_KIND}://${DATABASE_SERVICE}:${DATABASE_PORT}/${DATABASE_NAME}?requireSSL=true&sslMode=verify-ca&serverSslCert=/etc/tls/db/ca.crt" {{ else }} value: "jdbc:${QUARKUS_DATASOURCE_DB_KIND}://${DATABASE_SERVICE}:${DATABASE_PORT}/${DATABASE_NAME}" {{ end }} @@ -146,7 +146,7 @@ spec: readOnly: false {{ end }} {{ if .UseDBTLSCerts }} - - name: db-tls-certs + - name: db-ca-cert mountPath: /etc/tls/db readOnly: true {{ end }} @@ -238,8 +238,8 @@ spec: secretName: {{ .Instance.Name }}-internal defaultMode: 420 {{ if .UseDBTLSCerts }} - - name: db-tls-certs + - name: db-ca-cert secret: - secretName: {{ .Instance.Name }}-db-tls + secretName: {{ .Instance.Name }}-db-ca defaultMode: 420 {{ end }}