Skip to content

Commit da18fd1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#89326 from tanjunchen/remove-invalid-dependency-waitForPod-003
use e2epod.WaitTimeoutForPodReadyInNamespace directly
2 parents d3df233 + bed22fb commit da18fd1

File tree

10 files changed

+20
-23
lines changed

10 files changed

+20
-23
lines changed

‎test/e2e/common/container_probe.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ var _ = framework.KubeDescribe("Probing container", func() {
6363
framework.ConformanceIt("with readiness probe should not be ready before initial delay and never restart [NodeConformance]", func() {
6464
containerName := "test-webserver"
6565
p := podClient.Create(testWebServerPodSpec(probe.withInitialDelay().build(), nil, containerName, 80))
66-
f.WaitForPodReady(p.Name)
66+
e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, p.Name, f.Namespace.Name, framework.PodStartTimeout)
6767

6868
p, err := podClient.Get(context.TODO(), p.Name, metav1.GetOptions{})
6969
framework.ExpectNoError(err)

‎test/e2e/framework/framework.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -515,11 +515,6 @@ func (f *Framework) WaitForPodTerminated(podName, reason string) error {
515515
return e2epod.WaitForPodTerminatedInNamespace(f.ClientSet, podName, reason, f.Namespace.Name)
516516
}
517517

518-
// WaitForPodReady waits for the pod to flip to ready in the namespace.
519-
func (f *Framework) WaitForPodReady(podName string) error {
520-
return e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podName, f.Namespace.Name, PodStartTimeout)
521-
}
522-
523518
// ClientConfig an externally accessible method for reading the kube client config.
524519
func (f *Framework) ClientConfig() *rest.Config {
525520
ret := rest.CopyConfig(f.clientConfig)

‎test/e2e/framework/network/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ func (config *NetworkingTestConfig) createNetProxyPods(podName string, selector
664664
// wait that all of them are up
665665
runningPods := make([]*v1.Pod, 0, len(nodes))
666666
for _, p := range createdPods {
667-
framework.ExpectNoError(config.f.WaitForPodReady(p.Name))
667+
framework.ExpectNoError(e2epod.WaitTimeoutForPodReadyInNamespace(config.f.ClientSet, p.Name, config.f.Namespace.Name, framework.PodStartTimeout))
668668
rp, err := config.getPodClient().Get(context.TODO(), p.Name, metav1.GetOptions{})
669669
framework.ExpectNoError(err)
670670
runningPods = append(runningPods, rp)

‎test/e2e/kubectl/portforward.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func doTestConnectSendDisconnect(bindAddress string, f *framework.Framework) {
211211
if _, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(context.TODO(), pod, metav1.CreateOptions{}); err != nil {
212212
framework.Failf("Couldn't create pod: %v", err)
213213
}
214-
if err := f.WaitForPodReady(pod.Name); err != nil {
214+
if err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, pod.Name, f.Namespace.Name, framework.PodStartTimeout); err != nil {
215215
framework.Failf("Pod did not start running: %v", err)
216216
}
217217

@@ -259,7 +259,7 @@ func doTestMustConnectSendNothing(bindAddress string, f *framework.Framework) {
259259
if _, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(context.TODO(), pod, metav1.CreateOptions{}); err != nil {
260260
framework.Failf("Couldn't create pod: %v", err)
261261
}
262-
if err := f.WaitForPodReady(pod.Name); err != nil {
262+
if err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, pod.Name, f.Namespace.Name, framework.PodStartTimeout); err != nil {
263263
framework.Failf("Pod did not start running: %v", err)
264264
}
265265

@@ -296,7 +296,7 @@ func doTestMustConnectSendDisconnect(bindAddress string, f *framework.Framework)
296296
if _, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(context.TODO(), pod, metav1.CreateOptions{}); err != nil {
297297
framework.Failf("Couldn't create pod: %v", err)
298298
}
299-
if err := f.WaitForPodReady(pod.Name); err != nil {
299+
if err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, pod.Name, f.Namespace.Name, framework.PodStartTimeout); err != nil {
300300
framework.Failf("Pod did not start running: %v", err)
301301
}
302302

@@ -366,7 +366,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) {
366366
if _, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(context.TODO(), pod, metav1.CreateOptions{}); err != nil {
367367
framework.Failf("Couldn't create pod: %v", err)
368368
}
369-
if err := f.WaitForPodReady(pod.Name); err != nil {
369+
if err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, pod.Name, f.Namespace.Name, framework.PodStartTimeout); err != nil {
370370
framework.Failf("Pod did not start running: %v", err)
371371
}
372372

‎test/e2e/network/dns.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ var _ = SIGDescribe("DNS", func() {
424424
framework.Failf("ginkgo.Failed to delete pod %s: %v", testAgnhostPod.Name, err)
425425
}
426426
}()
427-
err = f.WaitForPodReady(testAgnhostPod.Name)
427+
err = e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, testAgnhostPod.Name, f.Namespace.Name, framework.PodStartTimeout)
428428
framework.ExpectNoError(err, "failed to wait for pod %s to be running", testAgnhostPod.Name)
429429

430430
runCommand := func(arg string) string {

‎test/e2e/network/firewall.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/kubernetes/test/e2e/framework"
3333
e2enetwork "k8s.io/kubernetes/test/e2e/framework/network"
3434
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
35+
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3536
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
3637
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
3738
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
@@ -154,7 +155,7 @@ var _ = SIGDescribe("Firewall rule", func() {
154155
pod.Spec.HostNetwork = true
155156
_, err := cs.CoreV1().Pods(ns).Create(context.TODO(), pod, metav1.CreateOptions{})
156157
framework.ExpectNoError(err)
157-
framework.ExpectNoError(f.WaitForPodReady(podName))
158+
framework.ExpectNoError(e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podName, f.Namespace.Name, framework.PodStartTimeout))
158159
framework.Logf("Netexec pod %q in namespace %q running", podName, ns)
159160

160161
defer func() {

‎test/e2e/network/network_policy.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ var _ = SIGDescribe("NetworkPolicy [LinuxOnly]", func() {
6060
podServer, service = createServerPodAndService(f, f.Namespace, "server", []int{80, 81})
6161

6262
ginkgo.By("Waiting for pod ready", func() {
63-
err := f.WaitForPodReady(podServer.Name)
63+
err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podServer.Name, f.Namespace.Name, framework.PodStartTimeout)
6464
framework.ExpectNoError(err)
6565
})
6666

@@ -1067,7 +1067,7 @@ var _ = SIGDescribe("NetworkPolicy [LinuxOnly]", func() {
10671067
defer cleanupServerPodAndService(f, podServerB, serviceB)
10681068

10691069
ginkgo.By("Waiting for pod ready", func() {
1070-
err := f.WaitForPodReady(podServerB.Name)
1070+
err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podServerB.Name, f.Namespace.Name, framework.PodStartTimeout)
10711071
framework.ExpectNoError(err, "Error occurred while waiting for pod type: Ready.")
10721072
})
10731073

@@ -1243,7 +1243,7 @@ var _ = SIGDescribe("NetworkPolicy [LinuxOnly]", func() {
12431243
// Creating pod-b and service-b
12441244
podServerB, serviceB = createServerPodAndService(f, f.Namespace, "pod-b", []int{80})
12451245
ginkgo.By("Waiting for pod-b to be ready", func() {
1246-
err = f.WaitForPodReady(podServerB.Name)
1246+
err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podServerB.Name, f.Namespace.Name, framework.PodStartTimeout)
12471247
framework.ExpectNoError(err, "Error occurred while waiting for pod type: Ready.")
12481248
})
12491249
defer cleanupServerPodAndService(f, podServerB, serviceB)
@@ -1380,7 +1380,7 @@ var _ = SIGDescribe("NetworkPolicy [LinuxOnly]", func() {
13801380
// Before applying policy, communication should be successful between pod-a and pod-b
13811381
podA, serviceA = createServerPodAndService(f, f.Namespace, "pod-a", []int{80})
13821382
ginkgo.By("Waiting for pod-a to be ready", func() {
1383-
err = f.WaitForPodReady(podA.Name)
1383+
err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podA.Name, f.Namespace.Name, framework.PodStartTimeout)
13841384
framework.ExpectNoError(err, "Error occurred while waiting for pod type: Ready.")
13851385
})
13861386
ginkgo.By("Creating client pod-b which should be able to contact the server pod-a.", func() {
@@ -1390,7 +1390,7 @@ var _ = SIGDescribe("NetworkPolicy [LinuxOnly]", func() {
13901390

13911391
podB, serviceB = createServerPodAndService(f, f.Namespace, "pod-b", []int{80})
13921392
ginkgo.By("Waiting for pod-b to be ready", func() {
1393-
err = f.WaitForPodReady(podB.Name)
1393+
err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podB.Name, f.Namespace.Name, framework.PodStartTimeout)
13941394
framework.ExpectNoError(err, "Error occurred while waiting for pod type: Ready.")
13951395
})
13961396
ginkgo.By("Creating client pod-a which should be able to contact the server pod-b.", func() {
@@ -1472,7 +1472,7 @@ var _ = SIGDescribe("NetworkPolicy [LinuxOnly]", func() {
14721472
// Creating server pod with label "pod-name": "pod-a" to deny traffic from client pod with label "pod-name": "pod-b"
14731473
podA, serviceA = createServerPodAndService(f, f.Namespace, "pod-a", []int{80})
14741474
ginkgo.By("Waiting for pod-a to be ready", func() {
1475-
err = f.WaitForPodReady(podA.Name)
1475+
err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podA.Name, f.Namespace.Name, framework.PodStartTimeout)
14761476
framework.ExpectNoError(err, "Error occurred while waiting for pod type: Ready.")
14771477
})
14781478

‎test/e2e/network/service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ var _ = SIGDescribe("Services", func() {
906906
pod.Labels = jig.Labels
907907
_, err = cs.CoreV1().Pods(ns).Create(context.TODO(), pod, metav1.CreateOptions{})
908908
framework.ExpectNoError(err)
909-
framework.ExpectNoError(f.WaitForPodReady(pod.Name))
909+
framework.ExpectNoError(e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, pod.Name, f.Namespace.Name, framework.PodStartTimeout))
910910
defer func() {
911911
framework.Logf("Cleaning up the echo server pod")
912912
err := cs.CoreV1().Pods(ns).Delete(context.TODO(), serverPodName, metav1.DeleteOptions{})
@@ -964,7 +964,7 @@ var _ = SIGDescribe("Services", func() {
964964
podTemplate.Labels = jig.Labels
965965
pod, err := cs.CoreV1().Pods(ns).Create(context.TODO(), podTemplate, metav1.CreateOptions{})
966966
framework.ExpectNoError(err)
967-
framework.ExpectNoError(f.WaitForPodReady(pod.Name))
967+
framework.ExpectNoError(e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, pod.Name, f.Namespace.Name, framework.PodStartTimeout))
968968

969969
ginkgo.By("waiting for the service to expose an endpoint")
970970
err = validateEndpointsPorts(cs, ns, serviceName, portsByPodName{serverPodName: {servicePort}})

‎test/e2e/node/kubelet.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func createPodUsingNfs(f *framework.Framework, c clientset.Interface, ns, nfsIP,
172172
rtnPod, err := c.CoreV1().Pods(ns).Create(context.TODO(), pod, metav1.CreateOptions{})
173173
framework.ExpectNoError(err)
174174

175-
err = f.WaitForPodReady(rtnPod.Name) // running & ready
175+
err = e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, rtnPod.Name, f.Namespace.Name, framework.PodStartTimeout) // running & ready
176176
framework.ExpectNoError(err)
177177

178178
rtnPod, err = c.CoreV1().Pods(ns).Get(context.TODO(), rtnPod.Name, metav1.GetOptions{}) // return fresh pod

‎test/e2e_node/startup_probe_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
2828
"k8s.io/kubernetes/test/e2e/common"
2929
"k8s.io/kubernetes/test/e2e/framework"
30+
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3031
testutils "k8s.io/kubernetes/test/utils"
3132
imageutils "k8s.io/kubernetes/test/utils/image"
3233

@@ -172,7 +173,7 @@ var _ = framework.KubeDescribe("StartupProbe [Serial] [Disruptive]", func() {
172173
p, err := podClient.Get(context.TODO(), p.Name, metav1.GetOptions{})
173174
framework.ExpectNoError(err)
174175

175-
f.WaitForPodReady(p.Name)
176+
e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, p.Name, f.Namespace.Name, framework.PodStartTimeout)
176177

177178
p, err = podClient.Get(context.TODO(), p.Name, metav1.GetOptions{})
178179
framework.ExpectNoError(err)

0 commit comments

Comments
 (0)