Allow user-provided cloud-init secrets for BMHs

openshift-cherrypick-robot · Jan 15, 2024 · 6898092 · 6898092
1 parent 4e94c18
commit 6898092
Show file tree

Hide file tree

Showing 3 changed files with 480 additions and 198 deletions.
diff --git a/api/v1beta1/common_openstackbaremetalset.go b/api/v1beta1/common_openstackbaremetalset.go
@@ -115,10 +115,10 @@ func VerifyBaremetalStatusHostRefs(
 }
 
 // VerifyBaremetalSetScaleUp -
-func VerifyBaremetalSetScaleUp(log logr.Logger, instance *OpenStackBaremetalSet, allBmhs *metal3v1.BareMetalHostList, existingBmhs *metal3v1.BareMetalHostList) ([]string, error) {
+func VerifyBaremetalSetScaleUp(log logr.Logger, instance *OpenStackBaremetalSet, allBmhs *metal3v1.BareMetalHostList, existingBmhs *metal3v1.BareMetalHostList) ([]metal3v1.BareMetalHost, error) {
 	// How many new BaremetalHost allocations do we need (if any)?
 	newBmhsNeededCount := instance.Spec.Count - len(existingBmhs.Items)
-	availableBaremetalHosts := []string{}
+	availableBaremetalHosts := []metal3v1.BareMetalHost{}
 
 	if newBmhsNeededCount > 0 {
 		// We have new replicas requested, so search for baremetalhosts that don't have consumerRef or Online set
@@ -162,7 +162,7 @@ func VerifyBaremetalSetScaleUp(log logr.Logger, instance *OpenStackBaremetalSet,
 
 			log.Info(fmt.Sprintf("Available BaremetalHost: %s", baremetalHost.ObjectMeta.Name))
 
-			availableBaremetalHosts = append(availableBaremetalHosts, baremetalHost.ObjectMeta.Name)
+			availableBaremetalHosts = append(availableBaremetalHosts, baremetalHost)
 		}
 
 		// If we can't satisfy the new requested replica count, explicitly state so