Use quorum queues if enabled

lmiccini · openshift-merge-bot[bot] · commit 6e4b482f6550 · 2025-09-16T21:14:26.000Z
With openstack-k8s-operators/infra-operator#429 we added the ability to configure RabbitMQ to use quorum queues. This commit adds a check to verify if "quorumqueues" has been added to the TransportURL secret. If its value is true, the services will be configured to use quorum queues. Jira: https://issues.redhat.com/browse/OSPRH-19160 Assisted-by: claude-4-sonnet
diff --git a/api/go.mod b/api/go.mod
@@ -3,7 +3,7 @@ module github.com/openstack-k8s-operators/watcher-operator/api
 go 1.21
 
 require (
-	github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec
+	github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250909143828-e33d35ffd64f
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03
 	k8s.io/api v0.29.15
 	k8s.io/apimachinery v0.29.15
diff --git a/api/go.sum b/api/go.sum
@@ -73,8 +73,8 @@ github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo
 github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI=
 github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec h1:Jvz2BuTWCvjeCbDzpPzlPMrUQpEe04Rzi8LPNxeW0Ts=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
+github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250909143828-e33d35ffd64f h1:chuu4iBT5sXHYw8aPeP/pWC+S3yGo6hdy39foP7c5vs=
+github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250909143828-e33d35ffd64f/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03 h1:9VanDdvg1APf9B1nzGElLvWr6dM5GsSayMLSV/nJZnE=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03/go.mod h1:Z+rmtn3qhuPZfx2EDVmloUh2MkYbvDMgcpJneRYerS0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
diff --git a/controllers/watcher_common.go b/controllers/watcher_common.go
@@ -71,6 +71,8 @@ const (
 	TransportURLSelector = "transport_url"
 	// NotificationURLSelector is the name of key in the secret created by the notification TransportURL
 	NotificationURLSelector = "notification_url"
+	// QuorumQueuesSelector is the name of key in the secret created by TransportURL for quorum queues enablement
+	QuorumQueuesSelector = "quorumqueues"
 	// DatabaseAccount is the name of key in the secret for the name of the Database Acount object
 	DatabaseAccount = "database_account"
 	// DatabaseUsername is the name of key in the secret for the user name used to login to the database
diff --git a/controllers/watcher_controller.go b/controllers/watcher_controller.go
@@ -878,6 +878,7 @@ func (r *WatcherReconciler) createSubLevelSecret(
 	data := map[string]string{
 		*instance.Spec.PasswordSelectors.Service: string(inputSecret.Data[*instance.Spec.PasswordSelectors.Service]),
 		TransportURLSelector:                     string(transportURLSecret.Data[TransportURLSelector]),
+		QuorumQueuesSelector:                     string(transportURLSecret.Data[QuorumQueuesSelector]),
 		DatabaseAccount:                          databaseAccount.Name,
 		DatabaseUsername:                         databaseAccount.Spec.UserName,
 		DatabasePassword:                         string(databaseSecret.Data[mariadbv1.DatabasePasswordSelector]),
diff --git a/controllers/watcherapi_controller.go b/controllers/watcherapi_controller.go
@@ -168,6 +168,7 @@ func (r *WatcherAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		[]string{
 			*instance.Spec.PasswordSelectors.Service,
 			TransportURLSelector,
+			QuorumQueuesSelector,
 			DatabaseAccount,
 			DatabaseUsername,
 			DatabaseHostname,
@@ -455,6 +456,7 @@ func (r *WatcherAPIReconciler) generateServiceConfigs(
 		"ServicePassword":          string(secret.Data[*instance.Spec.PasswordSelectors.Service]),
 		"ServiceUser":              *instance.Spec.ServiceUser,
 		"TransportURL":             string(secret.Data[TransportURLSelector]),
+		"QuorumQueues":             string(secret.Data[QuorumQueuesSelector]) == "true",
 		"MemcachedServers":         memcachedInstance.GetMemcachedServerListString(),
 		"MemcachedServersWithInet": memcachedInstance.GetMemcachedServerListWithInetString(),
 		"MemcachedTLS":             memcachedInstance.GetMemcachedTLSSupport(),
diff --git a/controllers/watcherapplier_controller.go b/controllers/watcherapplier_controller.go
@@ -165,6 +165,7 @@ func (r *WatcherApplierReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 		[]string{
 			*instance.Spec.PasswordSelectors.Service,
 			TransportURLSelector,
+			QuorumQueuesSelector,
 			DatabaseAccount,
 			DatabaseUsername,
 			DatabaseHostname,
@@ -422,6 +423,7 @@ func (r *WatcherApplierReconciler) generateServiceConfigs(
 		"ServicePassword":          string(secret.Data[*instance.Spec.PasswordSelectors.Service]),
 		"ServiceUser":              *instance.Spec.ServiceUser,
 		"TransportURL":             string(secret.Data[TransportURLSelector]),
+		"QuorumQueues":             string(secret.Data[QuorumQueuesSelector]) == "true",
 		"MemcachedServers":         memcachedInstance.GetMemcachedServerListString(),
 		"MemcachedServersWithInet": memcachedInstance.GetMemcachedServerListWithInetString(),
 		"MemcachedTLS":             memcachedInstance.GetMemcachedTLSSupport(),
diff --git a/controllers/watcherdecisionengine_controller.go b/controllers/watcherdecisionengine_controller.go
@@ -163,6 +163,7 @@ func (r *WatcherDecisionEngineReconciler) Reconcile(ctx context.Context, req ctr
 		[]string{
 			*instance.Spec.PasswordSelectors.Service,
 			TransportURLSelector,
+			QuorumQueuesSelector,
 			DatabaseAccount,
 			DatabaseUsername,
 			DatabaseHostname,
@@ -548,6 +549,7 @@ func (r *WatcherDecisionEngineReconciler) generateServiceConfigs(
 		"ServicePassword":          string(secret.Data[*instance.Spec.PasswordSelectors.Service]),
 		"ServiceUser":              *instance.Spec.ServiceUser,
 		"TransportURL":             string(secret.Data[TransportURLSelector]),
+		"QuorumQueues":             string(secret.Data[QuorumQueuesSelector]) == "true",
 		"MemcachedServers":         memcachedInstance.GetMemcachedServerListString(),
 		"MemcachedServersWithInet": memcachedInstance.GetMemcachedServerListWithInetString(),
 		"MemcachedTLS":             memcachedInstance.GetMemcachedTLSSupport(),
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.20.1
 	github.com/onsi/gomega v1.34.1
 	github.com/openshift/api v3.9.0+incompatible
-	github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec
+	github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250909143828-e33d35ffd64f
 	github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250905083405-40d18a7ca650
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03
 	github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250823121217-7e1cd2e3dd03
diff --git a/go.sum b/go.sum
@@ -78,8 +78,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6Beb1gQ96Ptej9AE/BvwCBiRj1E=
 github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec h1:Jvz2BuTWCvjeCbDzpPzlPMrUQpEe04Rzi8LPNxeW0Ts=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
+github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250909143828-e33d35ffd64f h1:chuu4iBT5sXHYw8aPeP/pWC+S3yGo6hdy39foP7c5vs=
+github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250909143828-e33d35ffd64f/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
 github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250905083405-40d18a7ca650 h1:n1s6jr8GJ6cn/1tjLVGPkTURb4ooHwjdS5YeppKdB0g=
 github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250905083405-40d18a7ca650/go.mod h1:G6BkoPfgALryMlOZwIH036iSWUMiDJQAYL1lXuLyPZ0=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03 h1:9VanDdvg1APf9B1nzGElLvWr6dM5GsSayMLSV/nJZnE=
diff --git a/templates/00-default.conf b/templates/00-default.conf
@@ -26,9 +26,15 @@ driver = noop
 {{ end }}
 
 [oslo_messaging_rabbit]
+{{- if (index . "QuorumQueues") }}
+rabbit_quorum_queue=true
+rabbit_transient_quorum_queue=true
+amqp_durable_queues=true
+{{- else }}
 amqp_durable_queues=false
 amqp_auto_delete=false
 heartbeat_in_pthread=false
+{{- end }}
 
 {{ if (index . "KeystoneAuthURL") }}
 [keystone_authtoken]
diff --git a/tests/functional/base_test.go b/tests/functional/base_test.go
@@ -39,6 +39,63 @@ func GetDefaultWatcherSpec() map[string]interface{} {
 	}
 }
 
+func CreateInternalTopLevelSecret() *corev1.Secret {
+	s := th.CreateSecret(
+		watcherTest.InternalTopLevelSecretName,
+		map[string][]byte{
+			"WatcherPassword":       []byte("service-password"),
+			"transport_url":         []byte("url"),
+			"quorumqueues":          []byte("false"),
+			"database_username":     []byte("username"),
+			"database_password":     []byte("password"),
+			"database_hostname":     []byte("hostname"),
+			"database_account":      []byte("watcher"),
+			"01-global-custom.conf": []byte(""),
+			"notification_url":      []byte(""),
+		},
+	)
+	logger.Info("InternalTopLevelSecret created")
+	return s
+}
+
+func CreateInternalTopLevelSecretNotification() *corev1.Secret {
+	s := th.CreateSecret(
+		watcherTest.InternalTopLevelSecretName,
+		map[string][]byte{
+			"WatcherPassword":       []byte("service-password"),
+			"transport_url":         []byte("url"),
+			"quorumqueues":          []byte("false"),
+			"database_username":     []byte("username"),
+			"database_password":     []byte("password"),
+			"database_hostname":     []byte("hostname"),
+			"database_account":      []byte("watcher"),
+			"01-global-custom.conf": []byte(""),
+			"notification_url":      []byte("rabbit://rabbitmq-notification-secret/fake"),
+		},
+	)
+	logger.Info("InternalTopLevelSecret created with notification_url")
+	return s
+}
+
+func CreateInternalTopLevelSecretQuorum() *corev1.Secret {
+	s := th.CreateSecret(
+		watcherTest.InternalTopLevelSecretName,
+		map[string][]byte{
+			"WatcherPassword":       []byte("service-password"),
+			"transport_url":         []byte("url"),
+			"quorumqueues":          []byte("true"),
+			"database_username":     []byte("username"),
+			"database_password":     []byte("password"),
+			"database_hostname":     []byte("hostname"),
+			"database_account":      []byte("watcher"),
+			"01-global-custom.conf": []byte(""),
+			"notification_url":      []byte(""),
+		},
+	)
+	logger.Info("InternalTopLevelSecret created with quorumqueues=true")
+	return s
+}
+
 // Second Watcher Spec to test proper parameters substitution
 func GetNonDefaultWatcherSpec() map[string]interface{} {
 	return map[string]interface{}{
diff --git a/tests/functional/watcherapi_controller_test.go b/tests/functional/watcherapi_controller_test.go
diff --git a/tests/functional/watcherapplier_controller_test.go b/tests/functional/watcherapplier_controller_test.go
diff --git a/tests/functional/watcherdecisionengine_controller_test.go b/tests/functional/watcherdecisionengine_controller_test.go
