introduce preprovisioningKernelParams to BMH

This commit:
 - Implements a new spec field of the BMH resource and implements
   related reconciliation logic in the bare metal host controller
 - Extends Ironic node update to servicing and preparing states too
 - Renames getInstanceUpdateOpts to getProvisioningInstanceUpdateOptsForNode
   to provide a more explicit name for the function and make it consistent
   with other UpdateOptsForNode type functions

Notes:
 - The new spec field is optional and not using it should provide the same UX
   as older BMO versions
 - Kernel pre provisioning arguments can't be changed when a node transitions
   from inspected (available) state to provisioning state if Ironic
   is configured to fast-track deployments.

Signed-off-by: Adam Rozman <[email protected]>

Author: Rozzii

apis/metal3.io/v1alpha1/baremetalhost_types.go

@@ -397,6 +397,11 @@ type BareMetalHostSpec struct {
 	// without hardware profiles.
 	HardwareProfile string `json:"hardwareProfile,omitempty"`
 
+	// The value of the kernel commandline argument list that will be passed
+	// to the pre provisioning agent's kernel during boot.
+	// +optional
+	PreprovisioningKernelParams string `json:"preprovisioningKernelParams,omitempty"`
+
 	// Provide guidance about how to choose the device for the image
 	// being provisioned. The default is currently to use /dev/sda as
 	// the root device.

internal/controller/metal3.io/baremetalhost_controller.go

@@ -83,6 +83,15 @@ func (info *reconcileInfo) publishEvent(reason, message string) {
 	info.events = append(info.events, info.host.NewEvent(reason, message))
 }
 
+// return the PreprovisioningKernelParams from the reconciliation info.
+func retrievePreprovisioningKernelParamsSpec(info *reconcileInfo) string {
+	preprovisioningKernelParams := ""
+	if info.host.Spec.PreprovisioningKernelParams != "" {
+		preprovisioningKernelParams = info.host.Spec.PreprovisioningKernelParams
+	}
+	return preprovisioningKernelParams
+}
+
 // +kubebuilder:rbac:groups=metal3.io,resources=baremetalhosts,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=metal3.io,resources=baremetalhosts/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=metal3.io,resources=baremetalhosts/finalizers,verbs=update
@@ -839,15 +848,15 @@ func (r *BareMetalHostReconciler) registerHost(prov provisioner.Provisioner, inf
 
 	provResult, provID, err := prov.Register(
 		provisioner.ManagementAccessData{
-			BootMode:                   info.host.Status.Provisioning.BootMode,
-			AutomatedCleaningMode:      info.host.Spec.AutomatedCleaningMode,
-			State:                      info.host.Status.Provisioning.State,
-			CurrentImage:               getCurrentImage(info.host),
-			PreprovisioningImage:       preprovImg,
-			PreprovisioningNetworkData: preprovisioningNetworkData,
-			HasCustomDeploy:            hasCustomDeploy(info.host),
-			DisablePowerOff:            info.host.Spec.DisablePowerOff,
-			CPUArchitecture:            getHostArchitecture(info.host),
+			BootMode:                    info.host.Status.Provisioning.BootMode,
+			AutomatedCleaningMode:       info.host.Spec.AutomatedCleaningMode,
+			State:                       info.host.Status.Provisioning.State,
+			CurrentImage:                getCurrentImage(info.host),
+			PreprovisioningImage:        preprovImg,
+			PreprovisioningNetworkData:  preprovisioningNetworkData,
+			PreprovisioningKernelParams: retrievePreprovisioningKernelParamsSpec(info),
+			HasCustomDeploy:             hasCustomDeploy(info.host),
+			DisablePowerOff:             info.host.Spec.DisablePowerOff,
 		},
 		credsChanged,
 		info.host.Status.ErrorType == metal3api.RegistrationError)
@@ -987,7 +996,8 @@ func (r *BareMetalHostReconciler) actionInspecting(prov provisioner.Provisioner,
 
 	provResult, started, details, err := prov.InspectHardware(
 		provisioner.InspectData{
-			BootMode: info.host.Status.Provisioning.BootMode,
+			BootMode:                    info.host.Status.Provisioning.BootMode,
+			PreprovisioningKernelParams: retrievePreprovisioningKernelParamsSpec(info),
 		},
 		info.host.Status.ErrorType == metal3api.InspectionError,
 		refresh,
@@ -1157,10 +1167,11 @@ func (r *BareMetalHostReconciler) actionPreparing(prov provisioner.Provisioner,
 	}
 
 	prepareData := provisioner.PrepareData{
-		TargetRAIDConfig: newStatus.Provisioning.RAID.DeepCopy(),
-		ActualRAIDConfig: info.host.Status.Provisioning.RAID.DeepCopy(),
-		RootDeviceHints:  newStatus.Provisioning.RootDeviceHints.DeepCopy(),
-		FirmwareConfig:   newStatus.Provisioning.Firmware.DeepCopy(),
+		TargetRAIDConfig:            newStatus.Provisioning.RAID.DeepCopy(),
+		ActualRAIDConfig:            info.host.Status.Provisioning.RAID.DeepCopy(),
+		RootDeviceHints:             newStatus.Provisioning.RootDeviceHints.DeepCopy(),
+		FirmwareConfig:              newStatus.Provisioning.Firmware.DeepCopy(),
+		PreprovisioningKernelParams: retrievePreprovisioningKernelParamsSpec(info),
 	}
 	// When manual cleaning fails, we think that the existing RAID configuration
 	// is invalid and needs to be reconfigured.
@@ -1282,12 +1293,13 @@ func (r *BareMetalHostReconciler) actionProvisioning(prov provisioner.Provisione
 	}
 
 	provResult, err := prov.Provision(provisioner.ProvisionData{
-		Image:           image,
-		CustomDeploy:    info.host.Spec.CustomDeploy.DeepCopy(),
-		HostConfig:      hostConf,
-		BootMode:        info.host.Status.Provisioning.BootMode,
-		HardwareProfile: hwProf,
-		RootDeviceHints: info.host.Status.Provisioning.RootDeviceHints.DeepCopy(),
+		Image:                       image,
+		CustomDeploy:                info.host.Spec.CustomDeploy.DeepCopy(),
+		HostConfig:                  hostConf,
+		BootMode:                    info.host.Status.Provisioning.BootMode,
+		HardwareProfile:             hwProf,
+		RootDeviceHints:             info.host.Status.Provisioning.RootDeviceHints.DeepCopy(),
+		PreprovisioningKernelParams: retrievePreprovisioningKernelParamsSpec(info),
 	}, forceReboot)
 	if err != nil {
 		return actionError{fmt.Errorf("failed to provision: %w", err)}
@@ -1403,6 +1415,7 @@ func (r *BareMetalHostReconciler) actionDeprovisioning(prov provisioner.Provisio
 
 func (r *BareMetalHostReconciler) doServiceIfNeeded(prov provisioner.Provisioner, info *reconcileInfo, hup *metal3api.HostUpdatePolicy) (result actionResult) {
 	servicingData := provisioner.ServicingData{}
+	servicingData.PreprovisioningKernelParams = retrievePreprovisioningKernelParamsSpec(info)
 
 	// (NOTE)janders: since Servicing is an opt-in feature that requires HostUpdatePolicy to be created and set to onReboot
 	// set below booleans to false by default and change to true based on policy settings

pkg/hardwareutils/bmc/access.go

@@ -68,7 +68,7 @@ type AccessDetails interface {
 	// pre-populated with the access information, and the caller is
 	// expected to add any other information that might be needed
 	// (such as the kernel and ramdisk locations).
-	DriverInfo(bmcCreds Credentials) map[string]interface{}
+	DriverInfo(bmcCreds Credentials, preProvKernParams string) map[string]interface{}
 
 	BIOSInterface() string