Perform draining and volume detaching once until completion

Signed-off-by: Danil-Grigorev <[email protected]>
kubernetes-sigs · Dec 19, 2024 · 1021f8e · 1021f8e
1 parent 8b08484
commit 1021f8e
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/internal/controllers/machine/machine_controller.go b/internal/controllers/machine/machine_controller.go
@@ -657,6 +657,10 @@ func (r *Reconciler) isNodeDrainAllowed(m *clusterv1.Machine) bool {
 		return false
 	}
 
+	if conditions.Get(m, clusterv1.PreTerminateDeleteHookSucceededCondition) != nil {
+		return false
+	}
+
 	return true
 }
 
@@ -677,6 +681,10 @@ func (r *Reconciler) isNodeVolumeDetachingAllowed(m *clusterv1.Machine) bool {
 		return false
 	}
 
+	if conditions.Get(m, clusterv1.PreTerminateDeleteHookSucceededCondition) != nil {
+		return false
+	}
+
 	return true
 }
 

diff --git a/internal/controllers/machine/machine_controller_test.go b/internal/controllers/machine/machine_controller_test.go
@@ -1428,6 +1428,28 @@ func TestIsNodeDrainedAllowed(t *testing.T) {
 			},
 			expected: false,
 		},
+		{
+			name: "Node draining succeeded",
+			machine: &clusterv1.Machine{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:       "test-machine",
+					Namespace:  metav1.NamespaceDefault,
+					Finalizers: []string{clusterv1.MachineFinalizer},
+				},
+				Spec: clusterv1.MachineSpec{
+					ClusterName:       "test-cluster",
+					InfrastructureRef: corev1.ObjectReference{},
+					Bootstrap:         clusterv1.Bootstrap{DataSecretName: ptr.To("data")},
+				},
+				Status: clusterv1.MachineStatus{
+					Conditions: clusterv1.Conditions{{
+						Type:   clusterv1.PreTerminateDeleteHookSucceededCondition,
+						Status: corev1.ConditionFalse,
+					}},
+				},
+			},
+			expected: false,
+		},
 		{
 			name: "Node draining timeout is not yet over",
 			machine: &clusterv1.Machine{
@@ -1989,6 +2011,28 @@ func TestIsNodeVolumeDetachingAllowed(t *testing.T) {
 			},
 			expected: false,
 		},
+		{
+			name: "Volume detach completed",
+			machine: &clusterv1.Machine{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:       "test-machine",
+					Namespace:  metav1.NamespaceDefault,
+					Finalizers: []string{clusterv1.MachineFinalizer},
+				},
+				Spec: clusterv1.MachineSpec{
+					ClusterName:       "test-cluster",
+					InfrastructureRef: corev1.ObjectReference{},
+					Bootstrap:         clusterv1.Bootstrap{DataSecretName: ptr.To("data")},
+				},
+				Status: clusterv1.MachineStatus{
+					Conditions: clusterv1.Conditions{{
+						Type:   clusterv1.PreTerminateDeleteHookSucceededCondition,
+						Status: corev1.ConditionFalse,
+					}},
+				},
+			},
+			expected: false,
+		},
 		{
 			name: "Volume detach timeout is not yet over",
 			machine: &clusterv1.Machine{