METAL-1721: Pass force to provisioner's detach

Author: CrystalChun

internal/controller/metal3.io/baremetalhost_controller.go

@@ -538,7 +538,7 @@ func (r *BareMetalHostReconciler) actionPowerOffBeforeDeleting(prov provisioner.
 }
 
 // Manage deletion of the host.
-func (r *BareMetalHostReconciler) actionDeleting(prov provisioner.Provisioner, info *reconcileInfo) actionResult {
+func (r *BareMetalHostReconciler) actionDeleting(prov provisioner.Provisioner, info *reconcileInfo, force bool) actionResult {
 	info.log.Info(
 		"marked to be deleted",
 		"timestamp", info.host.DeletionTimestamp,
@@ -550,7 +550,7 @@ func (r *BareMetalHostReconciler) actionDeleting(prov provisioner.Provisioner, i
 		return deleteComplete{}
 	}
 
-	provResult, err := prov.Delete()
+	provResult, err := prov.Delete(force)
 	if err != nil {
 		return actionError{fmt.Errorf("failed to delete: %w", err)}
 	}
@@ -616,8 +616,8 @@ func hasCustomDeploy(host *metal3api.BareMetalHost) bool {
 }
 
 // detachHost() detaches the host from the Provisioner.
-func (r *BareMetalHostReconciler) detachHost(prov provisioner.Provisioner, info *reconcileInfo) actionResult {
-	provResult, err := prov.Detach()
+func (r *BareMetalHostReconciler) detachHost(prov provisioner.Provisioner, info *reconcileInfo, force bool) actionResult {
+	provResult, err := prov.Detach(force)
 	if err != nil {
 		return actionError{fmt.Errorf("failed to detach: %w", err)}
 	}

internal/controller/metal3.io/host_state_machine.go

@@ -316,12 +316,12 @@ func (hsm *hostStateMachine) checkDetachedHost(info *reconcileInfo) (result acti
 		// Only allow detaching hosts in Provisioned/ExternallyProvisioned/Ready/Available states
 		switch info.host.Status.Provisioning.State {
 		case metal3api.StateProvisioned, metal3api.StateExternallyProvisioned, metal3api.StateReady, metal3api.StateAvailable:
-			return hsm.Reconciler.detachHost(hsm.Provisioner, info)
+			return hsm.Reconciler.detachHost(hsm.Provisioner, info, false)
 		default:
 			info.log.Info("host not in allowed detaching state, checking for force annotation")
 			if hasForceDetachAnnotation(hsm.Host) {
 				info.log.Info("forcing detach of host", "host", info.host.Name, "annotation", hsm.Host.GetAnnotations()[metal3api.DetachedAnnotation])
-				return hsm.Reconciler.detachHost(hsm.Provisioner, info)
+				return hsm.Reconciler.detachHost(hsm.Provisioner, info, true)
 			}
 			info.log.Info("host cannot be detached yet, waiting for the current operation to finish", "provisioningState", info.host.Status.Provisioning.State, "annotation", hsm.Host.GetAnnotations()[metal3api.DetachedAnnotation])
 		}
@@ -650,5 +650,5 @@ func (hsm *hostStateMachine) handlePoweringOffBeforeDelete(info *reconcileInfo)
 }
 
 func (hsm *hostStateMachine) handleDeleting(info *reconcileInfo) actionResult {
-	return hsm.Reconciler.actionDeleting(hsm.Provisioner, info)
+	return hsm.Reconciler.actionDeleting(hsm.Provisioner, info, false)
 }

internal/controller/metal3.io/host_state_machine_test.go

@@ -1378,11 +1378,11 @@ func (m *mockProvisioner) Deprovision(_ bool, _ metal3api.AutomatedCleaningMode)
 	return m.getNextResultByMethod("Deprovision"), err
 }
 
-func (m *mockProvisioner) Delete() (result provisioner.Result, err error) {
+func (m *mockProvisioner) Delete(_ bool) (result provisioner.Result, err error) {
 	return m.getNextResultByMethod("Delete"), err
 }
 
-func (m *mockProvisioner) Detach() (result provisioner.Result, err error) {
+func (m *mockProvisioner) Detach(_ bool) (result provisioner.Result, err error) {
 	res := m.getNextResultByMethod("Detach")
 	return res, err
 }

pkg/provisioner/ironic/delete_test.go

@@ -217,9 +217,9 @@ func deleteTest(t *testing.T, detach bool) {
 
 			var result provisioner.Result
 			if detach {
-				result, err = prov.Detach()
+				result, err = prov.Detach(false)
 			} else {
-				result, err = prov.Delete()
+				result, err = prov.Delete(false)
 			}
 
 			assert.Equal(t, tc.expectedDirty, result.Dirty)