Merge pull request #233 from openshift-cherrypick-robot/cherry-pick-2…

…31-to-18.0-fr1 [18.0-fr1] Expose ProvisionServerNodeSelector in baremetalset spec
openstack-k8s-operators · Nov 20, 2024 · 78d219a · 78d219a
2 parents 2bace32 + 2bd80e5
commit 78d219a
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())