Drop rabbitmq-cluster-operator and add rabbitmq version label

Makefile

@@ -166,7 +166,6 @@ bindata: kustomize yq ## Call sync bindata script
 	sed -i bindata/operator/operator.yaml -e "/customRequests/c\\            cpu: {{ .OpenStackOperator.Deployment.Manager.Resources.Requests.CPU }}\n            memory: {{ .OpenStackOperator.Deployment.Manager.Resources.Requests.Memory }}"
 	sed -i bindata/operator/operator.yaml -e "/customTolerations/c\\      tolerations:\n{{- range .OpenStackOperator.Deployment.Tolerations }}\n      - key: \"{{ .Key }}\"\n{{- if .Operator }}\n        operator: \"{{ .Operator }}\"\n{{- end }}\n{{- if .Value }}\n        value: \"{{ .Value }}\"\n{{- end }}\n{{- if .Effect }}\n        effect: \"{{ .Effect }}\"\n{{- end }}\n{{- if .TolerationSeconds }}\n        tolerationSeconds: {{ .TolerationSeconds }}\n{{- end }}\n{{- end }}"
 	cp config/operator/managers.yaml bindata/operator/
-	cp config/operator/rabbit.yaml bindata/operator/
 	$(KUSTOMIZE) build config/rbac > bindata/rbac/rbac.yaml
 	/bin/bash hack/sync-bindata.sh
 

api/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -14264,8 +14264,6 @@ spec:
                               x-kubernetes-preserve-unknown-fields: true
                           type: object
                         persistence:
-                          default:
-                            storage: 10Gi
                           properties:
                             storage:
                               anyOf:
@@ -14329,6 +14327,10 @@ spec:
                               x-kubernetes-list-type: atomic
                           type: object
                         queueType:
+                          enum:
+                          - Mirrored
+                          - Quorum
+                          - ""
                           type: string
                         rabbitmq:
                           properties:
@@ -14459,8 +14461,11 @@ spec:
                           type: object
                         skipPostDeploySteps:
                           type: boolean
+                        targetVersion:
+                          pattern: ^\d+\.\d+(\.\d+)?$
+                          type: string
                         terminationGracePeriodSeconds:
-                          default: 604800
+                          default: 60
                           format: int64
                           minimum: 0
                           type: integer
@@ -14489,6 +14494,7 @@ spec:
                                 type: string
                             type: object
                           type: array
+                          x-kubernetes-list-type: atomic
                         topologyRef:
                           properties:
                             name:

api/bases/core.openstack.org_openstackversions.yaml

@@ -250,6 +250,8 @@ spec:
                   properties:
                     glanceWsgi:
                       type: string
+                    rabbitmqVersion:
+                      type: string
                   type: object
                 type: object
               availableVersion:
@@ -685,6 +687,8 @@ spec:
                 properties:
                   glanceWsgi:
                     type: string
+                  rabbitmqVersion:
+                    type: string
                 type: object
               trackedCustomImages:
                 additionalProperties:

api/bases/operator.openstack.org_openstacks.yaml

@@ -141,7 +141,6 @@ spec:
                       - openstack-baremetal
                       - ovn
                       - placement
-                      - rabbitmq-cluster
                       - swift
                       - telemetry
                       - test

api/core/v1beta1/openstackversion_types.go

@@ -177,7 +177,8 @@ type ContainerTemplate struct {
 // ServiceDefaults - struct that contains defaults for OSP services that can change over time
 // but are associated with a specific OpenStack release version
 type ServiceDefaults struct {
-	GlanceWsgi *string `json:"glanceWsgi,omitempty"`
+	GlanceWsgi      *string `json:"glanceWsgi,omitempty"`
+	RabbitmqVersion *string `json:"rabbitmqVersion,omitempty"`
 }
 
 // OpenStackVersionStatus defines the observed state of OpenStackVersion

api/go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260401122242-169435483c1b
 	github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260328071427-ab8ab6bb163b
 	github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260328071141-745dbfa14e3b
-	github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260401053442-e06fc1a33511
+	github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260407114702-f57b3a58dcdf
 	github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260331205439-95a1fff93598
 	github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260321081256-de45f3b1de4f
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260331122750-ecff41ebb61d
@@ -86,7 +86,6 @@ require (
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.65.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
-	github.com/rabbitmq/cluster-operator/v2 v2.16.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/spf13/pflag v1.0.9 // indirect
 	github.com/x448/float16 v0.8.4 // indirect

api/go.sum

@@ -126,8 +126,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260328071427-ab8
 github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260328071427-ab8ab6bb163b/go.mod h1:P6x0NoadjMOG+4OUltsQIjVBnuKKNdQ7tNT/RgPy1HQ=
 github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260328071141-745dbfa14e3b h1:ID/qyo2yHjODs92PkzYTXDa49p9wXyrJgoKuOcacDwU=
 github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260328071141-745dbfa14e3b/go.mod h1:XGpzeDWNKorvRTrFdDk17rcd1KvlYxIO2Ad1tBFx4jc=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260401053442-e06fc1a33511 h1:W7AlsQoccL1UtW9FqF82Owz/8n8hmJ29/X5+2bCRUHQ=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260401053442-e06fc1a33511/go.mod h1:EKtKXGi4O7t/oExH1rGylTHAO5/LasNrf40a3ATT6uI=
+github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260407114702-f57b3a58dcdf h1:xMhl2jq4e26Xnq5PcR+QtmvNmHVUUwri+sPELOp1PC8=
+github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260407114702-f57b3a58dcdf/go.mod h1:c6jkCYVpYXazuRYxq7UEa+P+gKCSo5bFB85QvZf6nIg=
 github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260331205439-95a1fff93598 h1:+nkradPSUMkWl7CfIMAByA6Q+IClAcndYEvgwRfQohU=
 github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260331205439-95a1fff93598/go.mod h1:qJdBr1LodyiirL00WncMDH8DH3qHkak/i9x8qCZHm0w=
 github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260321081256-de45f3b1de4f h1:60I2YLHRznTY2BQXqXWc+ByJ3ipdQgKgW52t9J8C5DY=
@@ -154,8 +154,6 @@ github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260402040941-c0c6
 github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260402040941-c0c67dde993d/go.mod h1:wtnlbYH3u8jHHKltKDCf0ILNtCe7ZnOJSreSGXCbb2w=
 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260321143858-aaffa49d81f5 h1:/fQT4PDa30kz1k9dB48WcWHhEE1OP7hRXJuuURNGivo=
 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260321143858-aaffa49d81f5/go.mod h1:IuKiktN8yyVTD6T57XZN9Cbx0ZFIU+gwO4OLFa8nxu8=
-github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=
-github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
 github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260402140833-cb3823c777ae h1:iBcTYtdmtTdQ/YK4QlwVsgVcJYXoJvuzPROQbKIMo+M=
 github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260402140833-cb3823c777ae/go.mod h1:TB5DRh6pbSZU8RXt+wEnL1h8/fiDxfQysucOeRnEXQ8=
 github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260330123832-4b3fd508ca2d h1:W2HilD/wjvNBsOY7ALXewZbPuRxdPxRHGTuo1Pm9wvo=

api/operator/v1beta1/openstack_types.go

@@ -44,7 +44,6 @@ const (
 	OpenStackBaremetalOperatorName = "openstack-baremetal"
 	OvnOperatorName                = "ovn"
 	PlacementOperatorName          = "placement"
-	RabbitMQOperatorName           = "rabbitmq-cluster"
 	SwiftOperatorName              = "swift"
 	TelemetryOperatorName          = "telemetry"
 	TestOperatorName               = "test"
@@ -161,21 +160,6 @@ var (
 		{
 			Name: PlacementOperatorName,
 		},
-		{
-			Name: RabbitMQOperatorName,
-			ControllerManager: ContainerSpec{
-				Resources: corev1.ResourceRequirements{
-					Requests: corev1.ResourceList{
-						corev1.ResourceCPU:    resource.MustParse("5m"),
-						corev1.ResourceMemory: resource.MustParse("64Mi"),
-					},
-					Limits: corev1.ResourceList{
-						corev1.ResourceCPU:    resource.MustParse("200m"),
-						corev1.ResourceMemory: resource.MustParse("500Mi"),
-					},
-				},
-			},
-		},
 		{
 			Name: SwiftOperatorName,
 		},
@@ -204,7 +188,7 @@ type OpenStackSpec struct {
 type OperatorSpec struct {
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:MinLength=1
-	// +kubebuilder:validation:Enum:=openstack;barbican;cinder;designate;glance;heat;horizon;infra;ironic;keystone;manila;mariadb;neutron;nova;octavia;openstack-baremetal;ovn;placement;rabbitmq-cluster;swift;telemetry;test;watcher
+	// +kubebuilder:validation:Enum:=openstack;barbican;cinder;designate;glance;heat;horizon;infra;ironic;keystone;manila;mariadb;neutron;nova;octavia;openstack-baremetal;ovn;placement;swift;telemetry;test;watcher
 	// Name of the service operators.
 	Name string `json:"name"`
 

bindata/crds/crds.yaml

@@ -14529,8 +14529,6 @@ spec:
                               x-kubernetes-preserve-unknown-fields: true
                           type: object
                         persistence:
-                          default:
-                            storage: 10Gi
                           properties:
                             storage:
                               anyOf:
@@ -14594,6 +14592,10 @@ spec:
                               x-kubernetes-list-type: atomic
                           type: object
                         queueType:
+                          enum:
+                          - Mirrored
+                          - Quorum
+                          - ""
                           type: string
                         rabbitmq:
                           properties:
@@ -14724,8 +14726,11 @@ spec:
                           type: object
                         skipPostDeploySteps:
                           type: boolean
+                        targetVersion:
+                          pattern: ^\d+\.\d+(\.\d+)?$
+                          type: string
                         terminationGracePeriodSeconds:
-                          default: 604800
+                          default: 60
                           format: int64
                           minimum: 0
                           type: integer
@@ -14754,6 +14759,7 @@ spec:
                                 type: string
                             type: object
                           type: array
+                          x-kubernetes-list-type: atomic
                         topologyRef:
                           properties:
                             name:
@@ -21470,6 +21476,8 @@ spec:
                   properties:
                     glanceWsgi:
                       type: string
+                    rabbitmqVersion:
+                      type: string
                   type: object
                 type: object
               availableVersion:
@@ -21905,6 +21913,8 @@ spec:
                 properties:
                   glanceWsgi:
                     type: string
+                  rabbitmqVersion:
+                    type: string
                 type: object
               trackedCustomImages:
                 additionalProperties: