test fixes

kubernetes-sigs · Oct 4, 2024 · 8259fca · 8259fca
1 parent 3564dd0
commit 8259fca
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/internal/controllers/machine/machine_controller_test.go b/internal/controllers/machine/machine_controller_test.go
@@ -1653,9 +1653,10 @@ func TestDrainNode(t *testing.T) {
 
 			tracker := remote.NewTestClusterCacheTracker(ctrl.Log, c, remoteClient, fakeScheme, client.ObjectKeyFromObject(testCluster))
 			r := &Reconciler{
-				Client:     c,
-				Tracker:    tracker,
-				drainCache: drain.NewCache(),
+				Client:                   c,
+				Tracker:                  tracker,
+				drainCache:               drain.NewCache(),
+				waitForVolumeDetachCache: drain.NewCache(),
 			}
 
 			res, err := r.drainNode(ctx, testCluster, testMachine, tt.nodeName)
@@ -1752,10 +1753,12 @@ func TestDrainNode_withCaching(t *testing.T) {
 
 	tracker := remote.NewTestClusterCacheTracker(ctrl.Log, c, remoteClient, fakeScheme, client.ObjectKeyFromObject(testCluster))
 	drainCache := drain.NewCache()
+	waitForVolumeDetachCache := drain.NewCache()
 	r := &Reconciler{
-		Client:     c,
-		Tracker:    tracker,
-		drainCache: drainCache,
+		Client:                   c,
+		Tracker:                  tracker,
+		drainCache:               drainCache,
+		waitForVolumeDetachCache: waitForVolumeDetachCache,
 	}
 
 	// The first reconcile will cordon the Node, evict the one Pod running on the Node and then requeue.
@@ -3049,6 +3052,7 @@ func TestNodeDeletion(t *testing.T) {
 				Tracker:                  tracker,
 				recorder:                 record.NewFakeRecorder(10),
 				nodeDeletionRetryTimeout: 10 * time.Millisecond,
+				waitForVolumeDetachCache: drain.NewCache(),
 			}
 
 			cluster := testCluster.DeepCopy()
@@ -3173,6 +3177,7 @@ func TestNodeDeletionWithoutNodeRefFallback(t *testing.T) {
 				Tracker:                  tracker,
 				recorder:                 record.NewFakeRecorder(10),
 				nodeDeletionRetryTimeout: 10 * time.Millisecond,
+				waitForVolumeDetachCache: drain.NewCache(),
 			}
 
 			cluster := testCluster.DeepCopy()