Skip to content

K
k3s
Commit cd7a56ba authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28287 from kargakis/bump-timeout-for-deleting-deployments

Automatic merge from submit-queue e2e: increase timeout when waiting for deployment pods to be deleted Use the same timeout as the one used for waiting for the deployment reaper to complete. Takes a stab at https://github.com/kubernetes/kubernetes/issues/28067 @kubernetes/deployment PTAL
parents 11211a49 8f550c1a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
test/e2e/deployment.go
View file @ cd7a56ba
...@@ -198,7 +198,7 @@ func stopDeployment(c *clientset.Clientset, oldC client.Interface, ns, deploymen ...@@ -198,7 +198,7 @@ func stopDeployment(c *clientset.Clientset, oldC client.Interface, ns, deploymen
Expect(rss.Items).Should(HaveLen(0)) Expect(rss.Items).Should(HaveLen(0))
framework.Logf("Ensuring deployment %s's Pods were deleted", deploymentName) framework.Logf("Ensuring deployment %s's Pods were deleted", deploymentName)
var pods *api.PodList var pods *api.PodList
if err := wait.PollImmediate(time.Second, wait.ForeverTestTimeout, func() (bool, error) { if err := wait.PollImmediate(time.Second, timeout, func() (bool, error) {
pods, err = c.Core().Pods(ns).List(api.ListOptions{}) pods, err = c.Core().Pods(ns).List(api.ListOptions{})
if err != nil { if err != nil {
return false, err return false, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment