Inherit top-level nodeSelector in openstackclient template

Author: olliewalsh

apis/client/v1beta1/openstackclient_types.go

@@ -49,8 +49,8 @@ type OpenStackClientSpecCore struct {
 	OpenStackConfigSecret *string `json:"openStackConfigSecret"`
 
 	// +kubebuilder:validation:Optional
-	// NodeSelector to target subset of worker nodes running control plane services (currently only applies to KeystoneAPI and PlacementAPI)
-	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+	// NodeSelector to target subset of worker nodes
+	NodeSelector *map[string]string `json:"nodeSelector,omitempty"`
 
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec

apis/client/v1beta1/zz_generated.deepcopy.go

@@ -47,6 +47,10 @@ func ReconcileOpenStackClient(ctx context.Context, instance *corev1.OpenStackCon
 		return ctrl.Result{}, nil
 	}
 
+	if instance.Spec.OpenStackClient.Template.NodeSelector == nil {
+		instance.Spec.OpenStackClient.Template.NodeSelector = &instance.Spec.NodeSelector
+	}
+
 	Log.Info("Reconciling OpenStackClient", "OpenStackClient.Namespace", instance.Namespace, "OpenStackClient.Name", openstackclient.Name)
 	op, err := controllerutil.CreateOrPatch(ctx, helper.GetClient(), openstackclient, func() error {
 		instance.Spec.OpenStackClient.Template.DeepCopyInto(&openstackclient.Spec.OpenStackClientSpecCore)

pkg/openstack/openstackclient.go

@@ -87,8 +87,8 @@ func ClientPodSpec(
 		},
 	}
 
-	if instance.Spec.NodeSelector != nil && len(instance.Spec.NodeSelector) > 0 {
-		podSpec.NodeSelector = instance.Spec.NodeSelector
+	if instance.Spec.NodeSelector != nil {
+		podSpec.NodeSelector = *instance.Spec.NodeSelector
 	}
 
 	return podSpec