Add target version annotation to rabbitmq cluster

This commit adds the rabbitmq.openstack.org/target-version annotation
to the RabbitMQ cluster resource, using the constant from the
infra-operator API package. This annotation is used by the infra-operator
to trigger version upgrades, including skip-version upgrades (e.g., from
3.9 to 4.x) that require storage wipe.

The annotation value is sourced from OpenStackVersion.Status.ServiceDefaults.RabbitmqVersion,
allowing the openstack-operator to declaratively control RabbitMQ version
upgrades through the OpenStackVersion resource.

Jira: https://issues.redhat.com/browse/OSPRH-21178

Author: lmiccini

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/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/core/v1beta1/zz_generated.deepcopy.go

@@ -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:

config/crd/bases/core.openstack.org_openstackversions.yaml

@@ -277,6 +277,16 @@ func reconcileRabbitMQ(
 			rabbitmq.Spec.TLS.CaSecretName = tlsCert
 			rabbitmq.Spec.TLS.DisableNonTLSListeners = true
 		}
+		// add annotation to store the target rabbitmq-server version
+		if rabbitmq.GetAnnotations() == nil {
+			rabbitmq.SetAnnotations(make(map[string]string))
+		}
+		if version.Status.ServiceDefaults.RabbitmqVersion != nil {
+			rabbitmq.GetAnnotations()[rabbitmqv1.AnnotationTargetVersion] = *version.Status.ServiceDefaults.RabbitmqVersion
+		} else {
+			rabbitmq.GetAnnotations()[rabbitmqv1.AnnotationTargetVersion] = "3.9"
+		}
+
 		rabbitmq.Spec.ContainerImage = *version.Status.ContainerImages.RabbitmqImage
 		err := controllerutil.SetControllerReference(helper.GetBeforeObject(), rabbitmq, helper.GetScheme())
 		if err != nil {

internal/openstack/rabbitmq.go

@@ -230,6 +230,9 @@ func InitializeOpenStackVersionServiceDefaults(ctx context.Context) *corev1beta1
 	trueString := "true"
 	defaults.GlanceWsgi = &trueString // all new glance deployments use WSGI by default (FR3 and later)
 
+	versionString := "4.0"
+	defaults.RabbitmqVersion = &versionString // all new rabbitmq deployments will have rabbitm-server 4.0 (FR5)
+
 	return defaults
 }