diff --git a/api/go.mod b/api/go.mod index 248ac0c9..21711ef7 100644 --- a/api/go.mod +++ b/api/go.mod @@ -6,7 +6,7 @@ toolchain go1.24.6 require ( github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260508091801-73f228e6af31 - github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0 + github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260518125357-72bdd580c587 k8s.io/api v0.31.14 k8s.io/apimachinery v0.31.14 k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d diff --git a/api/go.sum b/api/go.sum index ba7a7303..629b2ed7 100644 --- a/api/go.sum +++ b/api/go.sum @@ -76,12 +76,12 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo/v2 v2.28.2 h1:DTrMfpqxiNUyQ3Y0zhn1n3cOO2euFgQPYIpkWwxVFps= github.com/onsi/ginkgo/v2 v2.28.2/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE= -github.com/onsi/gomega v1.40.0 h1:Vtol0e1MghCD2ZVIilPDIg44XSL9l2QAn8ZNaljWcJc= -github.com/onsi/gomega v1.40.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= +github.com/onsi/gomega v1.41.0 h1:OwKp4pXNgVxf6sCplzYo794OFNuoL2q2SBMU5NSWOjA= +github.com/onsi/gomega v1.41.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260508091801-73f228e6af31 h1:FWa0vNs175LpV1eSZ60YOGFdbJ3LqxQ1fxfprBRg7T4= github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260508091801-73f228e6af31/go.mod h1:/S2AN21zV70V1XuL0Of2dCjYWNkKwQSyNI8l/iQVrMs= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0 h1:vkFvn06Ns9qW4AbzFjFDu8ioosRmhkEZiDrO3DOQhLg= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0/go.mod h1:aIuG6lx3aS0vnXweRNdR/Q0SlfOsLIo0OzrqKK7C6xs= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260518125357-72bdd580c587 h1:p03uEXoSreyu7LpFmb9YyYM8tEx2D2+7qqhLXNWHTq0= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260518125357-72bdd580c587/go.mod h1:JC04T5G4E/he5ukonV1oCqa0QzFkLv761VbLruVghJM= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/go.mod b/go.mod index dfd07f0d..dd9c1ee8 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,11 @@ require ( github.com/go-logr/logr v1.4.3 github.com/google/uuid v1.6.0 github.com/onsi/ginkgo/v2 v2.28.2 - github.com/onsi/gomega v1.40.0 + github.com/onsi/gomega v1.41.0 github.com/openshift/api v3.9.0+incompatible github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260508091801-73f228e6af31 github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260507114237-f0b612d6c21f - github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0 + github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260518125357-72bdd580c587 github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20260506154724-30a976ba8ef0 github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260503164939-40728ae44d65 github.com/openstack-k8s-operators/watcher-operator/api v0.0.0-00010101000000-000000000000 diff --git a/go.sum b/go.sum index 18c61fa5..f93e3ce3 100644 --- a/go.sum +++ b/go.sum @@ -114,16 +114,16 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo/v2 v2.28.2 h1:DTrMfpqxiNUyQ3Y0zhn1n3cOO2euFgQPYIpkWwxVFps= github.com/onsi/ginkgo/v2 v2.28.2/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE= -github.com/onsi/gomega v1.40.0 h1:Vtol0e1MghCD2ZVIilPDIg44XSL9l2QAn8ZNaljWcJc= -github.com/onsi/gomega v1.40.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= +github.com/onsi/gomega v1.41.0 h1:OwKp4pXNgVxf6sCplzYo794OFNuoL2q2SBMU5NSWOjA= +github.com/onsi/gomega v1.41.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e h1:E1OdwSpqWuDPCedyUt0GEdoAE+r5TXy7YS21yNEo+2U= github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo= github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260508091801-73f228e6af31 h1:FWa0vNs175LpV1eSZ60YOGFdbJ3LqxQ1fxfprBRg7T4= github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260508091801-73f228e6af31/go.mod h1:/S2AN21zV70V1XuL0Of2dCjYWNkKwQSyNI8l/iQVrMs= github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260507114237-f0b612d6c21f h1:28WYAUIef3uion0Pps6doCSSbgZtIcodGzwG6BHhCOw= github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260507114237-f0b612d6c21f/go.mod h1:4ryvbSYuoN522BIPijnm0wMemPgJVKf7jCv8BNDq46I= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0 h1:vkFvn06Ns9qW4AbzFjFDu8ioosRmhkEZiDrO3DOQhLg= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0/go.mod h1:aIuG6lx3aS0vnXweRNdR/Q0SlfOsLIo0OzrqKK7C6xs= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260518125357-72bdd580c587 h1:p03uEXoSreyu7LpFmb9YyYM8tEx2D2+7qqhLXNWHTq0= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260518125357-72bdd580c587/go.mod h1:JC04T5G4E/he5ukonV1oCqa0QzFkLv761VbLruVghJM= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260430090237-a4265c18a162 h1:kUfZlcl+EbUBEWe6EGLXjzlUeYj7xZ21QsPA5jMJlwE= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260430090237-a4265c18a162/go.mod h1:7yqbVpg0k0vW+kZks+TMU/cd1ovoejyHfVPWcyGYLHI= github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260430090237-a4265c18a162 h1:b/E0t3klHOxMUzpp/TaMB6OwLliv9mwsHxE94i8Rifc= diff --git a/internal/controller/watcher_common.go b/internal/controller/watcher_common.go index adb3b4b5..e66033ae 100644 --- a/internal/controller/watcher_common.go +++ b/internal/controller/watcher_common.go @@ -309,6 +309,7 @@ func GenerateConfigsGeneric( customData map[string]string, cmLabels map[string]string, scripts bool, + commonTemplates []string, ) error { extraTemplates := map[string]string{ @@ -327,6 +328,7 @@ func GenerateConfigsGeneric( CustomData: customData, Labels: cmLabels, AdditionalTemplate: extraTemplates, + CommonTemplates: commonTemplates, }, } if scripts { diff --git a/internal/controller/watcher_controller.go b/internal/controller/watcher_controller.go index 76b19c17..154385aa 100644 --- a/internal/controller/watcher_controller.go +++ b/internal/controller/watcher_controller.go @@ -909,7 +909,7 @@ func (r *WatcherReconciler) generateServiceConfigDBJobs( templateParameters["ACSecret"] = acData.Secret } - return GenerateConfigsGeneric(ctx, helper, instance, envVars, templateParameters, customData, labels, true) + return GenerateConfigsGeneric(ctx, helper, instance, envVars, templateParameters, customData, labels, true, []string{}) } func (r *WatcherReconciler) ensureDBSync( diff --git a/internal/controller/watcherapi_controller.go b/internal/controller/watcherapi_controller.go index 68cb4b94..605fe705 100644 --- a/internal/controller/watcherapi_controller.go +++ b/internal/controller/watcherapi_controller.go @@ -513,7 +513,7 @@ func (r *WatcherAPIReconciler) generateServiceConfigs( } templateParameters["VHosts"] = httpdVhostConfig - return GenerateConfigsGeneric(ctx, helper, instance, envVars, templateParameters, customData, labels, false) + return GenerateConfigsGeneric(ctx, helper, instance, envVars, templateParameters, customData, labels, false, []string{"ssl.conf"}) } func (r *WatcherAPIReconciler) ensureDeployment( diff --git a/internal/controller/watcherapplier_controller.go b/internal/controller/watcherapplier_controller.go index 58afb6ba..cd448d97 100644 --- a/internal/controller/watcherapplier_controller.go +++ b/internal/controller/watcherapplier_controller.go @@ -458,7 +458,7 @@ func (r *WatcherApplierReconciler) generateServiceConfigs( templateParameters["MemcachedAuthCa"] = fmt.Sprint(memcachedv1.CaMountPath()) } - return GenerateConfigsGeneric(ctx, helper, instance, envVars, templateParameters, customData, labels, false) + return GenerateConfigsGeneric(ctx, helper, instance, envVars, templateParameters, customData, labels, false, []string{}) } // SetupWithManager sets up the controller with the Manager. diff --git a/internal/controller/watcherdecisionengine_controller.go b/internal/controller/watcherdecisionengine_controller.go index 47f75ae9..a6fa6d79 100644 --- a/internal/controller/watcherdecisionengine_controller.go +++ b/internal/controller/watcherdecisionengine_controller.go @@ -609,7 +609,7 @@ func (r *WatcherDecisionEngineReconciler) generateServiceConfigs( templateParameters["MemcachedAuthCa"] = fmt.Sprint(memcachedv1.CaMountPath()) } - return GenerateConfigsGeneric(ctx, helper, instance, envVars, templateParameters, customData, labels, false) + return GenerateConfigsGeneric(ctx, helper, instance, envVars, templateParameters, customData, labels, false, []string{}) } func (r *WatcherDecisionEngineReconciler) ensureDeployment( diff --git a/templates/watcherapi/config/ssl.conf b/templates/watcherapi/config/ssl.conf deleted file mode 100644 index e3da4ecb..00000000 --- a/templates/watcherapi/config/ssl.conf +++ /dev/null @@ -1,21 +0,0 @@ - - SSLRandomSeed startup builtin - SSLRandomSeed startup file:/dev/urandom 512 - SSLRandomSeed connect builtin - SSLRandomSeed connect file:/dev/urandom 512 - - AddType application/x-x509-ca-cert .crt - AddType application/x-pkcs7-crl .crl - - SSLPassPhraseDialog builtin - SSLSessionCache "shmcb:/var/cache/mod_ssl/scache(512000)" - SSLSessionCacheTimeout 300 - Mutex default - SSLCryptoDevice builtin - SSLHonorCipherOrder On - SSLUseStapling Off - SSLStaplingCache "shmcb:/run/httpd/ssl_stapling(32768)" - SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES - SSLProtocol all -SSLv2 -SSLv3 -TLSv1 - SSLOptions StdEnvVars -