diff --git a/test/e2e/apimachinery/generated_clientset.go b/test/e2e/apimachinery/generated_clientset.go index be0d4a4d2a0..349e554f6f7 100644 --- a/test/e2e/apimachinery/generated_clientset.go +++ b/test/e2e/apimachinery/generated_clientset.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/watch" "k8s.io/kubernetes/test/e2e/framework" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "github.com/onsi/ginkgo" @@ -147,7 +148,7 @@ var _ = SIGDescribe("Generated clientset", func() { // We need to wait for the pod to be scheduled, otherwise the deletion // will be carried out immediately rather than gracefully. - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) ginkgo.By("deleting the pod gracefully") gracePeriod := int64(31) diff --git a/test/e2e/apps/rc.go b/test/e2e/apps/rc.go index 09e359ff802..4fd7ddb8415 100644 --- a/test/e2e/apps/rc.go +++ b/test/e2e/apps/rc.go @@ -142,7 +142,7 @@ func TestReplicationControllerServeImageOrFail(f *framework.Framework, test stri if pod.DeletionTimestamp != nil { continue } - err = f.WaitForPodRunning(pod.Name) + err = e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) if err != nil { updatePod, getErr := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(context.TODO(), pod.Name, metav1.GetOptions{}) if getErr == nil { diff --git a/test/e2e/apps/replica_set.go b/test/e2e/apps/replica_set.go index de56a574ff0..f50801e2183 100644 --- a/test/e2e/apps/replica_set.go +++ b/test/e2e/apps/replica_set.go @@ -144,7 +144,7 @@ func testReplicaSetServeImageOrFail(f *framework.Framework, test string, image s if pod.DeletionTimestamp != nil { continue } - err = f.WaitForPodRunning(pod.Name) + err = e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) if err != nil { updatePod, getErr := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(context.TODO(), pod.Name, metav1.GetOptions{}) if getErr == nil { diff --git a/test/e2e/apps/statefulset.go b/test/e2e/apps/statefulset.go index d92d9db191c..0e915bd73c9 100644 --- a/test/e2e/apps/statefulset.go +++ b/test/e2e/apps/statefulset.go @@ -732,7 +732,7 @@ var _ = SIGDescribe("StatefulSet", func() { framework.ExpectNoError(err) ginkgo.By("Waiting until pod " + podName + " will start running in namespace " + f.Namespace.Name) - if err := f.WaitForPodRunning(podName); err != nil { + if err := e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, podName, f.Namespace.Name); err != nil { framework.Failf("Pod %v did not start running: %v", podName, err) } diff --git a/test/e2e/common/configmap_volume.go b/test/e2e/common/configmap_volume.go index e88a3cccd21..0774b298403 100644 --- a/test/e2e/common/configmap_volume.go +++ b/test/e2e/common/configmap_volume.go @@ -841,7 +841,7 @@ func createNonOptionalConfigMapPod(f *framework.Framework, volumeMountPath, podN } ginkgo.By("Creating the pod") pod = f.PodClient().Create(pod) - return f.WaitForPodRunning(pod.Name) + return e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) } func createNonOptionalConfigMapPodWithConfig(f *framework.Framework, volumeMountPath, podName string) error { @@ -903,5 +903,5 @@ func createNonOptionalConfigMapPodWithConfig(f *framework.Framework, volumeMount } ginkgo.By("Creating the pod") pod = f.PodClient().Create(pod) - return f.WaitForPodRunning(pod.Name) + return e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) } diff --git a/test/e2e/common/empty_dir.go b/test/e2e/common/empty_dir.go index 9782e2ecea5..6d776210c98 100644 --- a/test/e2e/common/empty_dir.go +++ b/test/e2e/common/empty_dir.go @@ -26,6 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" imageutils "k8s.io/kubernetes/test/utils/image" ) @@ -283,7 +284,7 @@ var _ = ginkgo.Describe("[sig-storage] EmptyDir volumes", func() { pod = f.PodClient().CreateSync(pod) ginkgo.By("Waiting for the pod running") - err = f.WaitForPodRunning(pod.Name) + err = e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) framework.ExpectNoError(err, "failed to deploy pod %s", pod.Name) ginkgo.By("Geting the pod") diff --git a/test/e2e/common/pods.go b/test/e2e/common/pods.go index 0dc11b19665..66bf63ff43f 100644 --- a/test/e2e/common/pods.go +++ b/test/e2e/common/pods.go @@ -43,6 +43,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" imageutils "k8s.io/kubernetes/test/utils/image" "github.com/onsi/ginkgo" @@ -290,7 +291,7 @@ var _ = framework.KubeDescribe("Pods", func() { // We need to wait for the pod to be running, otherwise the deletion // may be carried out immediately rather than gracefully. - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) // save the running pod pod, err = podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{}) framework.ExpectNoError(err, "failed to GET scheduled pod") @@ -397,7 +398,7 @@ var _ = framework.KubeDescribe("Pods", func() { pod.Labels["time"] = value }) - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) ginkgo.By("verifying the updated pod is in kubernetes") selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) @@ -718,7 +719,7 @@ var _ = framework.KubeDescribe("Pods", func() { }) time.Sleep(syncLoopFrequency) - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) ginkgo.By("get restart delay after image update") delayAfterUpdate, err := getRestartDelay(podClient, podName, containerName) diff --git a/test/e2e/common/secrets_volume.go b/test/e2e/common/secrets_volume.go index 80c8b3001a5..406d946ef2c 100644 --- a/test/e2e/common/secrets_volume.go +++ b/test/e2e/common/secrets_volume.go @@ -632,7 +632,7 @@ func createNonOptionalSecretPod(f *framework.Framework, volumeMountPath, podName } ginkgo.By("Creating the pod") pod = f.PodClient().Create(pod) - return f.WaitForPodRunning(pod.Name) + return e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) } func createNonOptionalSecretPodWithSecret(f *framework.Framework, volumeMountPath, podName string) error { @@ -693,5 +693,5 @@ func createNonOptionalSecretPodWithSecret(f *framework.Framework, volumeMountPat } ginkgo.By("Creating the pod") pod = f.PodClient().Create(pod) - return f.WaitForPodRunning(pod.Name) + return e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) } diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index e574a8ee3b9..6987cec1b77 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -523,11 +523,6 @@ func (f *Framework) WaitForPodNotFound(podName string, timeout time.Duration) er return e2epod.WaitForPodNotFoundInNamespace(f.ClientSet, podName, f.Namespace.Name, timeout) } -// WaitForPodRunning waits for the pod to run in the namespace. -func (f *Framework) WaitForPodRunning(podName string) error { - return e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, podName, f.Namespace.Name) -} - // WaitForPodReady waits for the pod to flip to ready in the namespace. func (f *Framework) WaitForPodReady(podName string) error { return e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podName, f.Namespace.Name, PodStartTimeout) diff --git a/test/e2e/framework/network/utils.go b/test/e2e/framework/network/utils.go index b3ba73fabe3..3b8da1fbaa3 100644 --- a/test/e2e/framework/network/utils.go +++ b/test/e2e/framework/network/utils.go @@ -567,7 +567,7 @@ func (config *NetworkingTestConfig) createTestPods() { config.createPod(hostTestContainerPod) } - framework.ExpectNoError(config.f.WaitForPodRunning(testContainerPod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(config.f.ClientSet, testContainerPod.Name, config.f.Namespace.Name)) var err error config.TestContainerPod, err = config.getPodClient().Get(context.TODO(), testContainerPod.Name, metav1.GetOptions{}) @@ -576,7 +576,7 @@ func (config *NetworkingTestConfig) createTestPods() { } if config.HostNetwork { - framework.ExpectNoError(config.f.WaitForPodRunning(hostTestContainerPod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(config.f.ClientSet, hostTestContainerPod.Name, config.f.Namespace.Name)) config.HostTestContainerPod, err = config.getPodClient().Get(context.TODO(), hostTestContainerPod.Name, metav1.GetOptions{}) if err != nil { framework.Failf("Failed to retrieve %s pod: %v", hostTestContainerPod.Name, err) diff --git a/test/e2e/network/dns.go b/test/e2e/network/dns.go index 3c9163fbaef..605e0e622f2 100644 --- a/test/e2e/network/dns.go +++ b/test/e2e/network/dns.go @@ -26,6 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eservice "k8s.io/kubernetes/test/e2e/framework/service" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" @@ -482,7 +483,7 @@ var _ = SIGDescribe("DNS", func() { framework.Failf("ginkgo.Failed to delete pod %s: %v", testServerPod.Name, err) } }() - err = f.WaitForPodRunning(testServerPod.Name) + err = e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, testServerPod.Name, f.Namespace.Name) framework.ExpectNoError(err, "failed to wait for pod %s to be running", testServerPod.Name) // Retrieve server pod IP. @@ -514,7 +515,7 @@ var _ = SIGDescribe("DNS", func() { framework.Failf("ginkgo.Failed to delete pod %s: %v", testUtilsPod.Name, err) } }() - err = f.WaitForPodRunning(testUtilsPod.Name) + err = e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, testUtilsPod.Name, f.Namespace.Name) framework.ExpectNoError(err, "failed to wait for pod %s to be running", testUtilsPod.Name) ginkgo.By("Verifying customized DNS option is configured on pod...") diff --git a/test/e2e/network/dns_common.go b/test/e2e/network/dns_common.go index 70e78610cbd..77920276f42 100644 --- a/test/e2e/network/dns_common.go +++ b/test/e2e/network/dns_common.go @@ -35,6 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" imageutils "k8s.io/kubernetes/test/utils/image" "github.com/onsi/ginkgo" @@ -226,7 +227,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) { t.utilPod, err = t.c.CoreV1().Pods(t.f.Namespace.Name).Create(context.TODO(), t.utilPod, metav1.CreateOptions{}) framework.ExpectNoError(err, "failed to create pod: %v", t.utilPod) framework.Logf("Created pod %v", t.utilPod) - err = t.f.WaitForPodRunning(t.utilPod.Name) + err = e2epod.WaitForPodNameRunningInNamespace(t.f.ClientSet, t.utilPod.Name, t.f.Namespace.Name) framework.ExpectNoError(err, "pod failed to start running: %v", t.utilPod) t.utilService = &v1.Service{ @@ -351,7 +352,7 @@ func (t *dnsTestCommon) createDNSPodFromObj(pod *v1.Pod) { t.dnsServerPod, err = t.c.CoreV1().Pods(t.f.Namespace.Name).Create(context.TODO(), t.dnsServerPod, metav1.CreateOptions{}) framework.ExpectNoError(err, "failed to create pod: %v", t.dnsServerPod) framework.Logf("Created pod %v", t.dnsServerPod) - err = t.f.WaitForPodRunning(t.dnsServerPod.Name) + err = e2epod.WaitForPodNameRunningInNamespace(t.f.ClientSet, t.dnsServerPod.Name, t.f.Namespace.Name) framework.ExpectNoError(err, "pod failed to start running: %v", t.dnsServerPod) t.dnsServerPod, err = t.c.CoreV1().Pods(t.f.Namespace.Name).Get(context.TODO(), t.dnsServerPod.Name, metav1.GetOptions{}) diff --git a/test/e2e/network/dual_stack.go b/test/e2e/network/dual_stack.go index 5bf70d13268..ba57003923d 100644 --- a/test/e2e/network/dual_stack.go +++ b/test/e2e/network/dual_stack.go @@ -33,6 +33,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment" e2enode "k8s.io/kubernetes/test/e2e/framework/node" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eservice "k8s.io/kubernetes/test/e2e/framework/service" imageutils "k8s.io/kubernetes/test/utils/image" netutils "k8s.io/utils/net" @@ -99,7 +100,7 @@ var _ = SIGDescribe("[Feature:IPv6DualStackAlphaFeature] [LinuxOnly]", func() { ginkgo.By("submitting the pod to kubernetes") podClient.CreateSync(pod) - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) p, err := podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{}) framework.ExpectNoError(err, "Failed to get pod %q", pod.Name) diff --git a/test/e2e/node/events.go b/test/e2e/node/events.go index 50729b4ad56..e25918101fd 100644 --- a/test/e2e/node/events.go +++ b/test/e2e/node/events.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" "github.com/onsi/ginkgo" ) @@ -76,7 +77,7 @@ var _ = SIGDescribe("Events", func() { framework.Failf("Failed to create pod: %v", err) } - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) ginkgo.By("verifying the pod is in kubernetes") selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) diff --git a/test/e2e/node/pods.go b/test/e2e/node/pods.go index ea6855b45fd..4c6a82285ed 100644 --- a/test/e2e/node/pods.go +++ b/test/e2e/node/pods.go @@ -37,6 +37,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" imageutils "k8s.io/kubernetes/test/utils/image" "github.com/onsi/ginkgo" @@ -102,7 +103,7 @@ var _ = SIGDescribe("Pods Extended", func() { // We need to wait for the pod to be running, otherwise the deletion // may be carried out immediately rather than gracefully. - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) // save the running pod pod, err = podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{}) framework.ExpectNoError(err, "failed to GET scheduled pod") diff --git a/test/e2e/node/pre_stop.go b/test/e2e/node/pre_stop.go index 66f9b70740b..73388489349 100644 --- a/test/e2e/node/pre_stop.go +++ b/test/e2e/node/pre_stop.go @@ -191,7 +191,7 @@ var _ = SIGDescribe("PreStop", func() { podClient.Create(pod) ginkgo.By("waiting for pod running") - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) var err error pod, err = podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{}) diff --git a/test/e2e/node/security_context.go b/test/e2e/node/security_context.go index 3a29f7d181b..dec5ce23585 100644 --- a/test/e2e/node/security_context.go +++ b/test/e2e/node/security_context.go @@ -267,7 +267,7 @@ func testPodSELinuxLabeling(f *framework.Framework, hostIPC bool, hostPID bool) _, err = client.Create(context.TODO(), pod, metav1.CreateOptions{}) framework.ExpectNoError(err, "Error creating pod %v", pod) - err = f.WaitForPodRunning(pod.Name) + err = e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) framework.ExpectNoError(err, "Error waiting for pod to run %v", pod) // for this to work, SELinux should be in enforcing mode, so let's check that diff --git a/test/e2e/scheduling/priorities.go b/test/e2e/scheduling/priorities.go index e96ff7d0a14..4c90fbc32fd 100644 --- a/test/e2e/scheduling/priorities.go +++ b/test/e2e/scheduling/priorities.go @@ -232,7 +232,7 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() { }, }) ginkgo.By("Wait the pod becomes running") - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) labelPod, err := cs.CoreV1().Pods(ns).Get(context.TODO(), labelPodName, metav1.GetOptions{}) framework.ExpectNoError(err) ginkgo.By("Verify the pod was scheduled to the expected node.") @@ -331,7 +331,7 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() { Name: tolerationPodName, Tolerations: tolerations, }) - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) ginkgo.By("Pod should prefer scheduled to the node that pod can tolerate.") tolePod, err := cs.CoreV1().Pods(ns).Get(context.TODO(), tolerationPodName, metav1.GetOptions{}) diff --git a/test/e2e/servicecatalog/BUILD b/test/e2e/servicecatalog/BUILD index 369d66be924..cfcdf65bf4f 100644 --- a/test/e2e/servicecatalog/BUILD +++ b/test/e2e/servicecatalog/BUILD @@ -17,6 +17,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/skipper:go_default_library", "//test/utils/image:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", diff --git a/test/e2e/servicecatalog/podpreset.go b/test/e2e/servicecatalog/podpreset.go index e6a544e752d..edd2564f1a9 100644 --- a/test/e2e/servicecatalog/podpreset.go +++ b/test/e2e/servicecatalog/podpreset.go @@ -30,6 +30,7 @@ import ( "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" imageutils "k8s.io/kubernetes/test/utils/image" @@ -145,7 +146,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { // We need to wait for the pod to be running, otherwise the deletion // may be carried out immediately rather than gracefully. - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name)) ginkgo.By("ensuring pod is modified") // save the running pod @@ -265,7 +266,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { // We need to wait for the pod to be running, otherwise the deletion // may be carried out immediately rather than gracefully. - framework.ExpectNoError(f.WaitForPodRunning(originalPod.Name)) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, originalPod.Name, f.Namespace.Name)) ginkgo.By("ensuring pod is modified") // save the running pod diff --git a/test/e2e/storage/empty_dir_wrapper.go b/test/e2e/storage/empty_dir_wrapper.go index f8e4b58a538..48718dfd092 100644 --- a/test/e2e/storage/empty_dir_wrapper.go +++ b/test/e2e/storage/empty_dir_wrapper.go @@ -418,7 +418,7 @@ func testNoWrappedVolumeRace(f *framework.Framework, volumes []v1.Volume, volume if pod.DeletionTimestamp != nil { continue } - err = f.WaitForPodRunning(pod.Name) + err = e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.Name, f.Namespace.Name) framework.ExpectNoError(err, "Failed waiting for pod %s to enter running state", pod.Name) } } diff --git a/test/e2e/storage/flexvolume_online_resize.go b/test/e2e/storage/flexvolume_online_resize.go index 5436fca1a04..04a6681213f 100644 --- a/test/e2e/storage/flexvolume_online_resize.go +++ b/test/e2e/storage/flexvolume_online_resize.go @@ -157,7 +157,7 @@ var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:Expa defer e2epod.DeletePodWithWait(c, pod) ginkgo.By("Waiting for pod to go to 'running' state") - err = f.WaitForPodRunning(pod.ObjectMeta.Name) + err = e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, pod.ObjectMeta.Name, f.Namespace.Name) framework.ExpectNoError(err, "Pod didn't go to 'running' state %v", err) ginkgo.By("Expanding current pvc") diff --git a/test/e2e/windows/dns.go b/test/e2e/windows/dns.go index e04cbf525f6..473b74b11f4 100644 --- a/test/e2e/windows/dns.go +++ b/test/e2e/windows/dns.go @@ -24,6 +24,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" + e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" imageutils "k8s.io/kubernetes/test/utils/image" @@ -59,7 +60,7 @@ var _ = SIGDescribe("DNS", func() { framework.Failf("Failed to delete pod %s: %v", testUtilsPod.Name, err) } }() - framework.ExpectNoError(f.WaitForPodRunning(testUtilsPod.Name), "failed to wait for pod %s to be running", testUtilsPod.Name) + framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, testUtilsPod.Name, f.Namespace.Name), "failed to wait for pod %s to be running", testUtilsPod.Name) ginkgo.By("Verifying customized DNS option is configured on pod...") cmd := []string{"ipconfig", "/all"}