Merge pull request #965 from Nordix/enable-detach-ready-nodes

Enable detach annotation for ready nodes
metal3-io · Sep 3, 2021 · ae74cdc · ae74cdc
2 parents c2d6d46 + 90f25de
commit ae74cdc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/controllers/metal3.io/host_state_machine.go b/controllers/metal3.io/host_state_machine.go
@@ -256,7 +256,7 @@ func (hsm *hostStateMachine) checkDetachedHost(info *reconcileInfo) (result acti
 	if hasDetachedAnnotation(hsm.Host) {
 		// Only allow detaching hosts in Provisioned/ExternallyProvisioned states
 		switch info.host.Status.Provisioning.State {
-		case metal3v1alpha1.StateProvisioned, metal3v1alpha1.StateExternallyProvisioned:
+		case metal3v1alpha1.StateProvisioned, metal3v1alpha1.StateExternallyProvisioned, metal3v1alpha1.StateReady:
 			return hsm.Reconciler.detachHost(hsm.Provisioner, info)
 		}
 	}

diff --git a/controllers/metal3.io/host_state_machine_test.go b/controllers/metal3.io/host_state_machine_test.go
@@ -318,10 +318,28 @@ func TestDetach(t *testing.T) {
 			ExpectedOperationalStatus: metal3v1alpha1.OperationalStatusOK,
 			ExpectedState:             metal3v1alpha1.StateReady,
 		},
+		{
+			Scenario:                  "DetachReadyHost",
+			Host:                      host(metal3v1alpha1.StateReady).SetImageURL("").SetStatusPoweredOn(false).build(),
+			HasDetachedAnnotation:     true,
+			ExpectedDetach:            true,
+			ExpectedDirty:             true,
+			ExpectedOperationalStatus: metal3v1alpha1.OperationalStatusDetached,
+			ExpectedState:             metal3v1alpha1.StateReady,
+		},
+		{
+			Scenario:                  "AttachReadyHost",
+			Host:                      host(metal3v1alpha1.StateReady).SetImageURL("").SetStatusPoweredOn(false).build(),
+			HasDetachedAnnotation:     false,
+			ExpectedDetach:            false,
+			ExpectedDirty:             true,
+			ExpectedOperationalStatus: metal3v1alpha1.OperationalStatusOK,
+			ExpectedState:             metal3v1alpha1.StateReady,
+		},
 		{
 			Scenario:                  "ReadyHost",
 			Host:                      host(metal3v1alpha1.StateReady).build(),
-			HasDetachedAnnotation:     true,
+			HasDetachedAnnotation:     false,
 			ExpectedDetach:            false,
 			ExpectedDirty:             true,
 			ExpectedOperationalStatus: metal3v1alpha1.OperationalStatusOK,