Expose ProvisionServerNodeSelector in baremetalset spec

This would allow selecting OCP nodes with specific networks to deploy OpenStackProvisionServer and avoid issues like assymetric routing when OSP networks are configured on some OCP worker nodes by setting `provisionServerNodeSelector` in `baremetalSetTemplate` field of nodeset spec. At present it's possible to pre-create OpenStackProvisionServer and use it in `baremetalSetTemplate` of OpenStackDaplaneNodeSet CR. Jira: https://issues.redhat.com/browse/OSPRH-11665 Signed-off-by: rabi <[email protected]>
openstack-k8s-operators · Nov 15, 2024 · 400f623 · 400f623
1 parent d69076b
commit 400f623
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml b/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml
@@ -268,9 +268,15 @@ spec:
                 type: object
                 x-kubernetes-map-type: atomic
               provisionServerName:
-                description: ProvisionServerName - Optional. If supplied will be used
-                  as the base Image for the baremetalset instead of baseImageURL.
+                description: ProvisionServerName - Optional. Existing OpenStackProvisionServer
+                  to use, else one would be created.
                 type: string
+              provisionServerNodeSelector:
+                additionalProperties:
+                  type: string
+                description: ProvisonServerNodeSelector to target subset of worker
+                  nodes running provision server
+                type: object
               provisioningInterface:
                 description: ProvisioningInterface - Optional. If not provided along
                   with ProvisionServerName, it would be discovered from CBO.  This

diff --git a/api/v1beta1/openstackbaremetalset_types.go b/api/v1beta1/openstackbaremetalset_types.go
@@ -71,9 +71,12 @@ type OpenStackBaremetalSetSpec struct {
 	// +kubebuilder:default=metadata
 	// +kubebuilder:validation:Optional
 	AutomatedCleaningMode AutomatedCleaningMode `json:"automatedCleaningMode,omitempty"`
-	// ProvisionServerName - Optional. If supplied will be used as the base Image for the baremetalset instead of baseImageURL.
+	// ProvisionServerName - Optional. Existing OpenStackProvisionServer to use, else one would be created.
 	// +kubebuilder:validation:Optional
 	ProvisionServerName string `json:"provisionServerName,omitempty"`
+	// +kubebuilder:validation:Optional
+	// ProvisonServerNodeSelector to target subset of worker nodes running provision server
+	ProvisonServerNodeSelector map[string]string `json:"provisionServerNodeSelector,omitempty"`
 	// ProvisioningInterface - Optional. If not provided along with ProvisionServerName, it would be discovered from CBO.  This is the provisioning interface on the OCP masters/workers.
 	// +kubebuilder:validation:Optional
 	ProvisioningInterface string `json:"provisioningInterface,omitempty"`

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml b/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml
@@ -268,9 +268,15 @@ spec:
                 type: object
                 x-kubernetes-map-type: atomic
               provisionServerName:
-                description: ProvisionServerName - Optional. If supplied will be used
-                  as the base Image for the baremetalset instead of baseImageURL.
+                description: ProvisionServerName - Optional. Existing OpenStackProvisionServer
+                  to use, else one would be created.
                 type: string
+              provisionServerNodeSelector:
+                additionalProperties:
+                  type: string
+                description: ProvisonServerNodeSelector to target subset of worker
+                  nodes running provision server
+                type: object
               provisioningInterface:
                 description: ProvisioningInterface - Optional. If not provided along
                   with ProvisionServerName, it would be discovered from CBO.  This

diff --git a/controllers/openstackbaremetalset_controller.go b/controllers/openstackbaremetalset_controller.go
@@ -518,6 +518,7 @@ func (r *OpenStackBaremetalSetReconciler) provisionServerCreateOrUpdate(
 		provisionServer.Spec.OSContainerImageURL = instance.Spec.OSContainerImageURL
 		provisionServer.Spec.ApacheImageURL = instance.Spec.ApacheImageURL
 		provisionServer.Spec.AgentImageURL = instance.Spec.AgentImageURL
+		provisionServer.Spec.NodeSelector = instance.Spec.ProvisonServerNodeSelector
 		provisionServer.Spec.Interface = instance.Spec.ProvisioningInterface
 
 		err = controllerutil.SetControllerReference(instance, provisionServer, helper.GetScheme())