Merge pull request #310 from omersch381/fix_controlNetworkName

[OSPRH-14758] Fix controlNetworkName requires default value

Author: openshift-merge-bot[bot]

controllers/designate_controller.go

@@ -1695,6 +1695,12 @@ func (r *DesignateReconciler) mdnsStatefulSetCreateOrUpdate(ctx context.Context,
 		statefulSet.Spec.NodeSelector = instance.Spec.DesignateMdns.NodeSelector
 		statefulSet.Spec.TopologyRef = instance.Spec.DesignateMdns.TopologyRef
 
+		networkAttachment := "designate"
+		if instance.Spec.DesignateNetworkAttachment != "" {
+			networkAttachment = instance.Spec.DesignateNetworkAttachment
+		}
+		statefulSet.Spec.ControlNetworkName = networkAttachment
+
 		err := controllerutil.SetControllerReference(instance, statefulSet, r.Scheme)
 		if err != nil {
 			return err
@@ -1779,6 +1785,12 @@ func (r *DesignateReconciler) backendbind9StatefulSetCreateOrUpdate(ctx context.
 		statefulSet.Spec.NodeSelector = instance.Spec.DesignateBackendbind9.NodeSelector
 		statefulSet.Spec.TopologyRef = instance.Spec.DesignateBackendbind9.TopologyRef
 
+		networkAttachment := "designate"
+		if instance.Spec.DesignateNetworkAttachment != "" {
+			networkAttachment = instance.Spec.DesignateNetworkAttachment
+		}
+		statefulSet.Spec.ControlNetworkName = networkAttachment
+
 		err := controllerutil.SetControllerReference(instance, statefulSet, r.Scheme)
 		if err != nil {
 			return err