Merge pull request #151 from rabi/preprovisioning-network-data

Add PreprovisioningNetworkDataName to baremetalset spec
openstack-k8s-operators · Mar 18, 2024 · e5f6ab9 · e5f6ab9
2 parents c4efa71 + c861726
commit e5f6ab9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml b/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml
@@ -85,6 +85,10 @@ spec:
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
+                    preprovisioningNetworkDataName:
+                      description: PreprovisioningNetworkDataName - NetwoData Secret
+                        name for Preprovisining in the local namespace
+                      type: string
                     userData:
                       description: UserData - Host User Data
                       properties:

diff --git a/api/v1beta1/openstackbaremetalset_types.go b/api/v1beta1/openstackbaremetalset_types.go
@@ -37,6 +37,9 @@ type InstanceSpec struct {
 	// +kubebuilder:validation:Optional
 	// NetworkData - Host Network Data
 	NetworkData *corev1.SecretReference `json:"networkData,omitempty"`
+	// +kubebuilder:validation:Optional
+	// PreprovisioningNetworkDataName - NetwoData Secret name for Preprovisining in the local namespace
+	PreprovisioningNetworkDataName string `json:"preprovisioningNetworkDataName,omitempty"`
 }
 
 // Allowed automated cleaning modes

diff --git a/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml b/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml
@@ -85,6 +85,10 @@ spec:
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
+                    preprovisioningNetworkDataName:
+                      description: PreprovisioningNetworkDataName - NetwoData Secret
+                        name for Preprovisining in the local namespace
+                      type: string
                     userData:
                       description: UserData - Host User Data
                       properties:

diff --git a/pkg/openstackbaremetalset/baremetalhost.go b/pkg/openstackbaremetalset/baremetalhost.go
@@ -205,6 +205,9 @@ func BaremetalHostProvision(
 		// Ensure AutomatedCleaningMode is set as per spec
 		foundBaremetalHost.Spec.AutomatedCleaningMode = metal3v1.AutomatedCleaningMode(instance.Spec.AutomatedCleaningMode)
 
+		// Ensure PreprovisioningNetworkDataName is set as per spec
+		foundBaremetalHost.Spec.PreprovisioningNetworkDataName = instance.Spec.BaremetalHosts[hostName].PreprovisioningNetworkDataName
+
 		//
 		// Ensure the image url is up to date unless already provisioned
 		//