Allow forced detachment of a host from Ironic

Adds Force as DetachedAnnotationArgument to API.
Detach in all states if force is set to true.
Add force argument to provisioner's Detach and Delete functions.

Signed-off-by: CrystalChun <cchun@redhat.com>

Author: CrystalChun

apis/metal3.io/v1alpha1/baremetalhost_types.go

@@ -685,6 +685,11 @@ const (
 type DetachedAnnotationArguments struct {
 	// DeleteAction indicates the desired delete logic when the detached annotation is present
 	DeleteAction DetachedDeleteAction `json:"deleteAction,omitempty"`
+
+	// Force indicates if detaching should be forced regardless of the host's state
+	// +optional
+	// +kubebuilder:default:=false
+	Force bool `json:"force,omitempty"`
 }
 
 // Match compares the saved status information with the name and

internal/controller/metal3.io/baremetalhost_controller.go

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

internal/controller/metal3.io/host_state_machine.go

@@ -317,9 +317,14 @@ func (hsm *hostStateMachine) checkDetachedHost(ctx context.Context, info *reconc
 		// 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(ctx, hsm.Provisioner, info)
+			return hsm.Reconciler.detachHost(ctx, hsm.Provisioner, info, false)
 		default:
-			info.log.Info("host cannot be detached yet, waiting for the current operation to finish", "provisioningState", info.host.Status.Provisioning.State)
+			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, 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])
 		}
 	}
 	if info.host.Status.ErrorType == metal3api.DetachError {
@@ -340,6 +345,20 @@ func (hsm *hostStateMachine) checkDetachedHost(ctx context.Context, info *reconc
 	return nil
 }
 
+func hasForceDetachAnnotation(host *metal3api.BareMetalHost) bool {
+	annotations := host.GetAnnotations()
+	if annotations != nil {
+		if val, ok := annotations[metal3api.DetachedAnnotation]; ok {
+			args := metal3api.DetachedAnnotationArguments{}
+			if err := json.Unmarshal([]byte(val), &args); err != nil {
+				return false
+			}
+			return args.Force
+		}
+	}
+	return false
+}
+
 func (hsm *hostStateMachine) ensureRegistered(ctx context.Context, info *reconcileInfo) (result actionResult) {
 	if !hsm.haveCreds {
 		// If we are in the process of deletion (which may start with
@@ -632,5 +651,5 @@ func (hsm *hostStateMachine) handlePoweringOffBeforeDelete(ctx context.Context,
 }
 
 func (hsm *hostStateMachine) handleDeleting(ctx context.Context, info *reconcileInfo) actionResult {
-	return hsm.Reconciler.actionDeleting(ctx, hsm.Provisioner, info)
+	return hsm.Reconciler.actionDeleting(ctx, hsm.Provisioner, info, false)
 }

internal/controller/metal3.io/host_state_machine_test.go

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

pkg/provisioner/demo/demo.go

@@ -277,7 +277,7 @@ func (p *demoProvisioner) Deprovision(_ context.Context, _ bool, _ metal3api.Aut
 // Delete removes the host from the provisioning system. It may be
 // called multiple times, and should return true for its dirty flag
 // until the deprovisioning operation is completed.
-func (p *demoProvisioner) Delete(_ context.Context) (result provisioner.Result, err error) {
+func (p *demoProvisioner) Delete(_ context.Context, _ bool) (result provisioner.Result, err error) {
 	p.log.Info("deleting host")
 	return result, nil
 }
@@ -287,7 +287,7 @@ func (p *demoProvisioner) Delete(_ context.Context) (result provisioner.Result,
 // for the target system.  It may be called multiple times,
 // and should return true for its dirty  flag until the
 // deletion operation is completed.
-func (p *demoProvisioner) Detach(_ context.Context) (result provisioner.Result, err error) {
+func (p *demoProvisioner) Detach(_ context.Context, _ bool) (result provisioner.Result, err error) {
 	p.log.Info("detaching host")
 	return result, nil
 }

pkg/provisioner/fixture/fixture.go

@@ -331,7 +331,7 @@ func (p *fixtureProvisioner) Deprovision(_ context.Context, _ bool, _ metal3api.
 // Delete removes the host from the provisioning system. It may be
 // called multiple times, and should return true for its dirty flag
 // until the deprovisioning operation is completed.
-func (p *fixtureProvisioner) Delete(_ context.Context) (result provisioner.Result, err error) {
+func (p *fixtureProvisioner) Delete(_ context.Context, _ bool) (result provisioner.Result, err error) {
 	p.log.Info("deleting host")
 
 	if !p.state.Deleted {
@@ -349,8 +349,8 @@ func (p *fixtureProvisioner) Delete(_ context.Context) (result provisioner.Resul
 // for the target system.  It may be called multiple times,
 // and should return true for its dirty  flag until the
 // deletion operation is completed.
-func (p *fixtureProvisioner) Detach(ctx context.Context) (result provisioner.Result, err error) {
-	return p.Delete(ctx)
+func (p *fixtureProvisioner) Detach(ctx context.Context, force bool) (result provisioner.Result, err error) {
+	return p.Delete(ctx, force)
 }
 
 // PowerOn ensures the server is powered on independently of any image

pkg/provisioner/ironic/delete_test.go

@@ -217,9 +217,15 @@ func deleteTest(t *testing.T, detach bool) {
 
 			var result provisioner.Result
 			if detach {
+<<<<<<< HEAD
 				result, err = prov.Detach(t.Context())
 			} else {
 				result, err = prov.Delete(t.Context())
+=======
+				result, err = prov.Detach(false)
+			} else {
+				result, err = prov.Delete(false)
+>>>>>>> 33f438dc (Allow forced detachment of a host from Ironic)
 			}
 
 			assert.Equal(t, tc.expectedDirty, result.Dirty)

pkg/provisioner/ironic/ironic.go

@@ -1510,7 +1510,7 @@ func (p *ironicProvisioner) Deprovision(ctx context.Context, restartOnFailure bo
 // Delete removes the host from the provisioning system. It may be
 // called multiple times, and should return true for its dirty flag
 // until the deprovisioning operation is completed.
-func (p *ironicProvisioner) Delete(ctx context.Context) (result provisioner.Result, err error) {
+func (p *ironicProvisioner) Delete(ctx context.Context, _ bool) (result provisioner.Result, err error) {
 	ironicNode, err := p.getNode(ctx)
 	if err != nil {
 		if errors.Is(err, provisioner.ErrNeedsRegistration) {
@@ -1592,10 +1592,10 @@ func (p *ironicProvisioner) Delete(ctx context.Context) (result provisioner.Resu
 // for the target system.  It may be called multiple times,
 // and should return true for its dirty  flag until the
 // deletion operation is completed.
-func (p *ironicProvisioner) Detach(ctx context.Context) (result provisioner.Result, err error) {
+func (p *ironicProvisioner) Detach(ctx context.Context, force bool) (result provisioner.Result, err error) {
 	// Currently the same behavior as Delete()
 	p.log.Info("removing the node for detachment", "node", p.nodeID)
-	return p.Delete(ctx)
+	return p.Delete(ctx, force)
 }
 
 // softPowerOffUnsupportedError is returned when the BMC does not

pkg/provisioner/provisioner.go

@@ -182,14 +182,14 @@ type Provisioner interface {
 	// Delete removes the host from the provisioning system. It may be
 	// called multiple times, and should return true for its dirty
 	// flag until the deletion operation is completed.
-	Delete(ctx context.Context) (result Result, err error)
+	Delete(ctx context.Context, force bool) (result Result, err error)
 
 	// Detach removes the host from the provisioning system.
 	// Similar to Delete, but ensures non-interruptive behavior
 	// for the target system.  It may be called multiple times,
 	// and should return true for its dirty  flag until the
 	// deletion operation is completed.
-	Detach(ctx context.Context) (result Result, err error)
+	Detach(ctx context.Context, force bool) (result Result, err error)
 
 	// PowerOn ensures the server is powered on independently of any image
 	// provisioning operation.