Inherit top-level nodeSelector in rabbitmq template

Author: olliewalsh

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -10879,6 +10879,10 @@ spec:
                           format: int32
                           minimum: 0
                           type: integer
+                        nodeSelector:
+                          additionalProperties:
+                            type: string
+                          type: object
                         override:
                           properties:
                             service:

apis/core/v1beta1/openstackcontrolplane_types.go

@@ -507,6 +507,10 @@ type RabbitmqTemplate struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// Overrides to use when creating the Rabbitmq clusters
 	rabbitmqv2.RabbitmqClusterSpecCore `json:",inline"`
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// NodeSelector to target subset of worker nodes running this service
+	NodeSelector *map[string]string `json:"nodeSelector,omitempty"`
 }
 
 // OvnSection defines the desired state of OVN services

apis/core/v1beta1/zz_generated.deepcopy.go

@@ -10879,6 +10879,10 @@ spec:
                           format: int32
                           minimum: 0
                           type: integer
+                        nodeSelector:
+                          additionalProperties:
+                            type: string
+                          type: object
                         override:
                           properties:
                             service:

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

@@ -310,6 +310,18 @@ func reconcileRabbitMQ(
 		tlsCert = certSecret.Name
 	}
 
+	if spec.Override.StatefulSet == nil {
+		spec.Override.StatefulSet = &defaultStatefulSet
+	}
+
+	if spec.Override.StatefulSet.Spec.Template.Spec.NodeSelector == nil {
+		if spec.NodeSelector != nil {
+			spec.Override.StatefulSet.Spec.Template.Spec.NodeSelector = *spec.NodeSelector
+		} else {
+			spec.Override.StatefulSet.Spec.Template.Spec.NodeSelector = instance.Spec.NodeSelector
+		}
+	}
+
 	op, err := controllerutil.CreateOrPatch(ctx, helper.GetClient(), rabbitmq, func() error {
 
 		rabbitmq.Spec.Image = *version.Status.ContainerImages.RabbitmqImage
@@ -362,11 +374,6 @@ func reconcileRabbitMQ(
 			rabbitmq.Spec.Persistence.StorageClassName = &instance.Spec.StorageClass
 		}
 
-		if rabbitmq.Spec.Override.StatefulSet == nil {
-			Log.Info("Setting StatefulSet")
-			rabbitmq.Spec.Override.StatefulSet = &defaultStatefulSet
-		}
-
 		if rabbitmq.Spec.Override.Service != nil &&
 			rabbitmq.Spec.Override.Service.Spec != nil &&
 			rabbitmq.Spec.Override.Service.Spec.Type == corev1.ServiceTypeLoadBalancer {