Merge pull request #932 from stuggi/OSPRH-8066

Fix panic if no annotation is provided for rabbitmq LoadBalancer override
openstack-k8s-operators · Jul 15, 2024 · 4ffcbc0 · 4ffcbc0
2 parents 65c922a + 3e45ef6
commit 4ffcbc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
@@ -6,12 +6,12 @@ metadata:
     capabilities: Basic Install
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "true"
-    operatorframework.io/suggested-namespace: openstack-operators
     features.operators.openshift.io/proxy-aware: "false"
     features.operators.openshift.io/tls-profiles: "false"
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
+    operatorframework.io/suggested-namespace: openstack-operators
     operators.operatorframework.io/builder: operator-sdk-v1.26.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: openstack-operator.v0.0.0

diff --git a/pkg/openstack/rabbitmq.go b/pkg/openstack/rabbitmq.go
@@ -346,6 +346,9 @@ func reconcileRabbitMQ(
 
 		if rabbitmq.Spec.Override.Service != nil &&
 			rabbitmq.Spec.Override.Service.Spec.Type == corev1.ServiceTypeLoadBalancer {
+			if rabbitmq.Spec.Override.Service.EmbeddedLabelsAnnotations == nil {
+				rabbitmq.Spec.Override.Service.EmbeddedLabelsAnnotations = &rabbitmqv2.EmbeddedLabelsAnnotations{}
+			}
 			rabbitmq.Spec.Override.Service.Annotations =
 				util.MergeStringMaps(rabbitmq.Spec.Override.Service.Annotations,
 					map[string]string{networkv1.AnnotationHostnameKey: hostname})