Add skip wait for delete timeout

openshift · Jan 29, 2020 · c99f27b · c99f27b
1 parent f0c52c1
commit c99f27b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/pkg/controller/machine/controller.go b/pkg/controller/machine/controller.go
@@ -83,6 +83,8 @@ const (
 
 	// Machine has a deletion timestamp
 	phaseDeleting = "Deleting"
+
+	skipWaitForDeleteTimeoutSeconds = 60 * 5
 )
 
 var DefaultActuator Actuator
@@ -344,6 +346,12 @@ func (r *ReconcileMachine) drainNode(machine *machinev1.Machine) error {
 		DryRun: false,
 	}
 
+	for _, condition := range node.Status.Conditions {
+		if condition.Type == corev1.NodeReady && condition.Status == corev1.ConditionUnknown {
+			drainer.SkipWaitForDeleteTimeoutSeconds = skipWaitForDeleteTimeoutSeconds
+		}
+	}
+
 	if err := drain.RunCordonOrUncordon(drainer, node, true); err != nil {
 		// Can't cordon a node
 		klog.Warningf("cordon failed for node %q: %v", node.Name, err)