Fix RabbitMQ image default/override logic

openstack-k8s-operators · Sep 19, 2023 · cc93e92 · cc93e92
1 parent cda0e1f
commit cc93e92
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -311,9 +311,11 @@ func (r *OpenStackControlPlane) DefaultServices() {
 	// so we aren't able to add and call a Default function on its spec.
 	// Instead we just directly set the defaults we need.
 	for key, template := range r.Spec.Rabbitmq.Templates {
-		template.Image = openstackControlPlaneDefaults.RabbitMqImageURL
-		// By-value copy, need to update
-		r.Spec.Rabbitmq.Templates[key] = template
+		if template.Image == "" {
+			template.Image = openstackControlPlaneDefaults.RabbitMqImageURL
+			// By-value copy, need to update
+			r.Spec.Rabbitmq.Templates[key] = template
+		}
 	}
 
 	// Cinder