Merge pull request #944 from stuggi/OSPRH-8490

Fix panic if no spec is provided for rabbitmq LoadBalancer override
openstack-k8s-operators · Jul 16, 2024 · a910186 · a910186
2 parents 6380cf1 + 07caea6
commit a910186
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/openstack/rabbitmq.go b/pkg/openstack/rabbitmq.go
@@ -342,10 +342,13 @@ func reconcileRabbitMQ(
 		}
 
 		if rabbitmq.Spec.Override.Service != nil &&
+			rabbitmq.Spec.Override.Service.Spec != nil &&
 			rabbitmq.Spec.Override.Service.Spec.Type == corev1.ServiceTypeLoadBalancer {
 			if rabbitmq.Spec.Override.Service.EmbeddedLabelsAnnotations == nil {
 				rabbitmq.Spec.Override.Service.EmbeddedLabelsAnnotations = &rabbitmqv2.EmbeddedLabelsAnnotations{}
 			}
+
+			// add annotation to register service name in dnsmasq
 			rabbitmq.Spec.Override.Service.Annotations =
 				util.MergeStringMaps(rabbitmq.Spec.Override.Service.Annotations,
 					map[string]string{networkv1.AnnotationHostnameKey: hostname})