PCP-5472: During HCP cluster upgrade , one of the machine is stuck in deleting state (#279)

* PCP-5472: During HCP cluster upgrade , one of the machine is stuck in deleting state

Author: AmitSahastra

controllers/maasmachine_controller.go

@@ -176,8 +176,17 @@ func (r *MaasMachineReconciler) reconcileDelete(_ context.Context, machineScope
 
 	// Check if the host evacuation finalizer is present - if so, requeue for HMC controller
 	if controllerutil.ContainsFinalizer(maasMachine, HostEvacuationFinalizer) {
+		// Evacuation requires the MAAS systemID; if it's missing, there's nothing to evacuate.
+		hasSystemID := maasMachine.Spec.SystemID != nil && *maasMachine.Spec.SystemID != ""
+		if !hasSystemID {
+			machineScope.Info("No systemID/providerID; removing evacuation finalizer to unblock deletion")
+			controllerutil.RemoveFinalizer(maasMachine, HostEvacuationFinalizer)
+			return ctrl.Result{}, nil
+		}
+
+		// Log using Spec.SystemID directly to avoid providerID parse errors
 		machineScope.Info("Host evacuation finalizer present, requeuing for HMC controller to handle evacuation",
-			"systemID", machineScope.GetInstanceID())
+			"systemID", *maasMachine.Spec.SystemID)
 		return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
 	}