From 5a8b695fef2ee860a3f3b796f7f16c29559ade79 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 9 Sep 2019 15:09:01 +0200 Subject: [PATCH] Validate AgnhostPod readyness status in e2e tests We now additionally check if the agnhost pods are ready before marking the pod as running to increase the overall test stability. Relates to: https://github.com/kubernetes/kubernetes/pull/82420 Fixes: https://github.com/kubernetes/kubernetes/issues/82445 Signed-off-by: Sascha Grunert --- test/e2e/network/dns.go | 2 +- test/e2e/network/firewall.go | 2 +- test/e2e/network/service.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/e2e/network/dns.go b/test/e2e/network/dns.go index f57e7dc51cf..54a06219699 100644 --- a/test/e2e/network/dns.go +++ b/test/e2e/network/dns.go @@ -421,7 +421,7 @@ var _ = SIGDescribe("DNS", func() { framework.Failf("ginkgo.Failed to delete pod %s: %v", testAgnhostPod.Name, err) } }() - err = f.WaitForPodRunning(testAgnhostPod.Name) + err = f.WaitForPodReady(testAgnhostPod.Name) framework.ExpectNoError(err, "failed to wait for pod %s to be running", testAgnhostPod.Name) runCommand := func(arg string) string { diff --git a/test/e2e/network/firewall.go b/test/e2e/network/firewall.go index 06241372643..a049f0b2f88 100644 --- a/test/e2e/network/firewall.go +++ b/test/e2e/network/firewall.go @@ -145,7 +145,7 @@ var _ = SIGDescribe("Firewall rule", func() { pod.Spec.HostNetwork = true _, err := cs.CoreV1().Pods(ns).Create(pod) framework.ExpectNoError(err) - framework.ExpectNoError(f.WaitForPodRunning(podName)) + framework.ExpectNoError(f.WaitForPodReady(podName)) framework.Logf("Netexec pod %q in namespace %q running", podName, ns) defer func() { diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index a1aaf22b7c4..2272febe808 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -308,7 +308,7 @@ var _ = SIGDescribe("Services", func() { pod.Labels = jig.Labels _, err = cs.CoreV1().Pods(ns).Create(pod) framework.ExpectNoError(err) - framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) + framework.ExpectNoError(f.WaitForPodReady(pod.Name)) defer func() { framework.Logf("Cleaning up the echo server pod") err := cs.CoreV1().Pods(ns).Delete(serverPodName, nil) @@ -366,6 +366,7 @@ var _ = SIGDescribe("Services", func() { podTemplate.Labels = jig.Labels pod, err := cs.CoreV1().Pods(ns).Create(podTemplate) framework.ExpectNoError(err) + framework.ExpectNoError(f.WaitForPodReady(pod.Name)) ginkgo.By("waiting for the service to expose an endpoint") err = e2eendpoints.ValidateEndpointsPorts(cs, ns, serviceName, e2eendpoints.PortsByPodName{serverPodName: {servicePort}})