UPSTREAM: <carry>: improve flakiness in evicted pod test

If this proves useful, we can try to push it upstream

Author: tkashem

test/e2e/node/pods.go

@@ -324,7 +324,7 @@ var _ = SIGDescribe("Pods Extended", func() {
 							},
 							Resources: v1.ResourceRequirements{
 								Limits: v1.ResourceList{
-									"ephemeral-storage": resource.MustParse("5Mi"),
+									"ephemeral-storage": resource.MustParse("3Mi"),
 								},
 							}},
 					},
@@ -338,7 +338,16 @@ var _ = SIGDescribe("Pods Extended", func() {
 				return podClient.Delete(ctx, pod.Name, metav1.DeleteOptions{})
 			})
 
-			err := e2epod.WaitForPodTerminatedInNamespace(ctx, f.ClientSet, pod.Name, "Evicted", f.Namespace.Name)
+			ginkgo.By("waiting for pod to be running")
+			err := e2epod.WaitForPodRunningInNamespace(ctx, f.ClientSet, pod)
+			if err != nil {
+				framework.Failf("error waiting for pod to be running: %v", err)
+			}
+
+			// the defualt timeout is 5m, and the ephemeral storage
+			// is expected to live for 3m, this should give us some
+			// buffer for the test to withstand a flaky environment
+			err = e2epod.WaitForPodTerminatedInNamespace(ctx, f.ClientSet, pod.Name, "Evicted", f.Namespace.Name)
 			if err != nil {
 				framework.Failf("error waiting for pod to be evicted: %v", err)
 			}