Merge pull request #36199 from foxish/fix-flake-node-resize

test/e2e/framework/util.go

@@ -1404,27 +1404,6 @@ func WaitForRCToStabilize(c clientset.Interface, ns, name string, timeout time.D
 	return err
 }
 
-// WaitForPodAddition waits for pods to be added within the timeout.
-func WaitForPodAddition(c clientset.Interface, ns string, timeout time.Duration) error {
-	options := api.ListOptions{FieldSelector: fields.Set{
-		"metadata.namespace": ns,
-	}.AsSelector()}
-
-	w, err := c.Core().Pods(ns).Watch(options)
-	if err != nil {
-		return err
-	}
-	_, err = watch.Until(timeout, w, func(event watch.Event) (bool, error) {
-		switch event.Type {
-		case watch.Added:
-			return true, nil
-		}
-		Logf("Waiting for pod(s) to be added in namespace %v", ns)
-		return false, nil
-	})
-	return err
-}
-
 func WaitForPodToDisappear(c clientset.Interface, ns, podName string, label labels.Selector, interval, timeout time.Duration) error {
 	return wait.PollImmediate(interval, timeout, func() (bool, error) {
 		Logf("Waiting for pod %s to disappear", podName)

test/e2e/resize_nodes.go

@@ -307,8 +307,9 @@ var _ = framework.KubeDescribe("Nodes [Disruptive]", func() {
 			err = framework.WaitForClusterSize(c, int(replicas-1), 10*time.Minute)
 			Expect(err).NotTo(HaveOccurred())
 
-			By("waiting for podGC to remove/recreate any pods scheduled on the now non-existent node")
-			framework.WaitForPodAddition(c, ns, 2*time.Minute)
+			By("waiting 1 minute for the watch in the podGC to catch up, remove any pods scheduled on " +
+				"the now non-existent node and the RC to recreate it")
+			time.Sleep(time.Minute)
 
 			By("verifying whether the pods from the removed node are recreated")
 			err = framework.VerifyPods(c, ns, name, true, replicas)