address review comments

kubernetes-sigs · Jan 8, 2025 · cb8e89c · cb8e89c
1 parent fc4ae67
commit cb8e89c
Showing 1 changed file with 6 additions and 29 deletions.
diff --git a/internal/controllers/machine/machine_controller_test.go b/internal/controllers/machine/machine_controller_test.go
@@ -3622,7 +3622,6 @@ func TestNodeDeletionWithHooks(t *testing.T) {
 		name                 string
 		deletionTimeout      *metav1.Duration
 		resultErr            bool
-		clusterDeleted       bool
 		expectNodeDeletion   bool
 		expectDeletingReason string
 		annotations          map[string]string
@@ -3668,7 +3667,7 @@ func TestNodeDeletionWithHooks(t *testing.T) {
 			expectNodeDeletion:   false,
 			expectDeletingReason: clusterv1.MachineDeletingDrainingNodeV1Beta2Reason,
 			annotations: map[string]string{
-				"machine.cluster.x-k8s.io": "",
+				"machine.cluster.x-k8s.io/exclude-wait-for-node-volume-detach": "",
 			},
 			createFakeClient: func(initObjs ...client.Object) client.Client {
 				return fake.NewClientBuilder().
@@ -3697,13 +3696,8 @@ func TestNodeDeletionWithHooks(t *testing.T) {
 				reconcileDeleteCache:     cache.New[cache.ReconcileEntry](),
 			}
 
-			cluster := testCluster.DeepCopy()
-			if tc.clusterDeleted {
-				cluster.DeletionTimestamp = &metav1.Time{Time: deletionTime.Add(time.Hour)}
-			}
-
 			s := &scope{
-				cluster:                   cluster,
+				cluster:                   &testCluster,
 				machine:                   m,
 				infraMachineIsNotFound:    true,
 				bootstrapConfigIsNotFound: true,
@@ -3749,7 +3743,7 @@ func TestNodeDeletionWithPreDrainHook(t *testing.T) {
 				clusterv1.MachineControlPlaneLabel: "",
 			},
 			Annotations: map[string]string{
-				"machine.cluster.x-k8s.io": "",
+				"machine.cluster.x-k8s.io/exclude-wait-for-node-volume-detach": "",
 			},
 			Finalizers:        []string{clusterv1.MachineFinalizer},
 			DeletionTimestamp: &metav1.Time{Time: deletionTime},
@@ -3797,7 +3791,6 @@ func TestNodeDeletionWithPreDrainHook(t *testing.T) {
 		name                 string
 		deletionTimeout      *metav1.Duration
 		resultErr            bool
-		clusterDeleted       bool
 		expectNodeDeletion   bool
 		expectDeletingReason string
 		pods                 []*corev1.Pod
@@ -3886,13 +3879,8 @@ func TestNodeDeletionWithPreDrainHook(t *testing.T) {
 				reconcileDeleteCache:     cache.New[cache.ReconcileEntry](),
 			}
 
-			cluster := testCluster.DeepCopy()
-			if tc.clusterDeleted {
-				cluster.DeletionTimestamp = &metav1.Time{Time: deletionTime.Add(time.Hour)}
-			}
-
 			s := &scope{
-				cluster:                   cluster,
+				cluster:                   &testCluster,
 				machine:                   m,
 				infraMachineIsNotFound:    true,
 				bootstrapConfigIsNotFound: true,
@@ -4055,13 +4043,8 @@ func TestNodeDeletionWithInfraAndBootstrap(t *testing.T) {
 				reconcileDeleteCache:     cache.New[cache.ReconcileEntry](),
 			}
 
-			cluster := testCluster.DeepCopy()
-			if tc.clusterDeleted {
-				cluster.DeletionTimestamp = &metav1.Time{Time: deletionTime.Add(time.Hour)}
-			}
-
 			s := &scope{
-				cluster:                   cluster,
+				cluster:                   &testCluster,
 				machine:                   m,
 				infraMachineIsNotFound:    tc.infraMachineFound,
 				infraMachine:              tc.infraMachine,
@@ -4209,7 +4192,6 @@ func TestNodeDeletionWithVolumeDetach(t *testing.T) {
 		deletionTimeout      *metav1.Duration
 		resultErr            bool
 		remoteObjects        []client.Object
-		clusterDeleted       bool
 		expectNodeDeletion   bool
 		expectDeletingReason string
 		createFakeClient     func(...client.Object) client.Client
@@ -4300,13 +4282,8 @@ func TestNodeDeletionWithVolumeDetach(t *testing.T) {
 				reconcileDeleteCache:     cache.New[cache.ReconcileEntry](),
 			}
 
-			cluster := testCluster.DeepCopy()
-			if tc.clusterDeleted {
-				cluster.DeletionTimestamp = &metav1.Time{Time: deletionTime.Add(time.Hour)}
-			}
-
 			s := &scope{
-				cluster:                   cluster,
+				cluster:                   &testCluster,
 				machine:                   m,
 				infraMachineIsNotFound:    true,
 				bootstrapConfigIsNotFound: true,