@@ -303,6 +303,15 @@ func (r *Reconciler) reconcileClusterSpec(dbSpec *nbv1.NooBaaDBSpec) error {
303303 Enabled : true ,
304304 }
305305
306+ if r .CNPGCluster .Spec .Certificates == nil {
307+ r .CNPGCluster .Spec .Certificates = & cnpgv1.CertificatesConfiguration {}
308+ }
309+ r .CNPGCluster .Spec .Certificates .ServerAltDNSNames = []string {
310+ r .ServiceDbPg .Name ,
311+ r .ServiceDbPg .Name + "." + r .Request .Namespace ,
312+ r .ServiceDbPg .Name + "." + r .Request .Namespace + ".svc" ,
313+ }
314+
306315 r .CNPGCluster .Spec .FailoverDelay = defaultFailoverDelaySec
307316
308317 r .setPostgresConfig ()
@@ -608,6 +617,17 @@ func (r *Reconciler) setPostgresConfig() {
608617 }
609618 r .cnpgLog ("PGTune config: memory=%dKB, cpu=%d, endpoints=%d" , totalMemoryKB , cpuNum , endpointMaxCount )
610619
620+ // propagate TLS security settings to the PostgreSQL server
621+ tlsSec := r .NooBaa .Spec .Security .APIServerSecurity
622+ if tlsSec != nil && ! util .IsTLSConfigDisabled () {
623+ if tlsSec .TLSMinVersion != nil {
624+ overrideParameters ["ssl_min_protocol_version" ] = string (* tlsSec .TLSMinVersion )
625+ }
626+ if len (tlsSec .TLSCiphers ) > 0 {
627+ overrideParameters ["ssl_ciphers" ] = util .MapCiphersToOpenSSL (tlsSec .TLSCiphers )
628+ }
629+ }
630+
611631 // apply any user-specified DBConf overrides on top of the calculated values
612632 if r .NooBaa .Spec .DBSpec .DBConf != nil {
613633 for k , v := range r .NooBaa .Spec .DBSpec .DBConf {
@@ -881,6 +901,7 @@ func (r *Reconciler) wasClusterSpecChanged(existingClusterSpec *cnpgv1.ClusterSp
881901 ! reflect .DeepEqual (existingClusterSpec .Monitoring , r .CNPGCluster .Spec .Monitoring ) ||
882902 ! reflect .DeepEqual (existingClusterSpec .PostgresConfiguration .Parameters , r .CNPGCluster .Spec .PostgresConfiguration .Parameters ) ||
883903 ! reflect .DeepEqual (existingClusterSpec .Backup , r .CNPGCluster .Spec .Backup ) ||
904+ ! reflect .DeepEqual (existingClusterSpec .Certificates , r .CNPGCluster .Spec .Certificates ) ||
884905 existingClusterSpec .PriorityClassName != r .CNPGCluster .Spec .PriorityClassName ||
885906 existingClusterSpec .FailoverDelay != r .CNPGCluster .Spec .FailoverDelay
886907}
0 commit comments