Merge pull request kubernetes#125794 from bzsuni/cleanup/PollImmediateWithContext

k8s-ci-robot · web-flow · commit 2e39a55d49dd · 2024-07-01T00:13:05.000-07:00
Use PollUntilContextTimeout to replace PollImmediateWithContext
diff --git a/test/e2e/framework/node/helper.go b/test/e2e/framework/node/helper.go
@@ -46,10 +46,11 @@ func WaitForAllNodesSchedulable(ctx context.Context, c clientset.Interface, time
 	}
 
 	framework.Logf("Waiting up to %v for all (but %d) nodes to be schedulable", timeout, framework.TestContext.AllowedNotReadyNodes)
-	return wait.PollImmediateWithContext(
+	return wait.PollUntilContextTimeout(
 		ctx,
 		30*time.Second,
 		timeout,
+		true,
 		CheckReadyForTests(ctx, c, framework.TestContext.NonblockingTaints, framework.TestContext.AllowedNotReadyNodes, largeClusterThreshold),
 	)
 }

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,11 @@ func WaitForAllNodesSchedulable(ctx context.Context, c clientset.Interface, time`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`framework.Logf("Waiting up to %v for all (but %d) nodes to be schedulable", timeout, framework.TestContext.AllowedNotReadyNodes)`
`49`		`- return wait.PollImmediateWithContext(`
	`49`	`+ return wait.PollUntilContextTimeout(`
`50`	`50`	`ctx,`
`51`	`51`	`30*time.Second,`
`52`	`52`	`timeout,`
	`53`	`+ true,`
`53`	`54`	`CheckReadyForTests(ctx, c, framework.TestContext.NonblockingTaints, framework.TestContext.AllowedNotReadyNodes, largeClusterThreshold),`
`54`	`55`	`)`
`55`	`56`	`}`