github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82491 from openSUSE/pod-status-check

Browse Source 
Validate container status in e2e pod status checks
This commit is contained in:
Kubernetes Prow Robot 2019-10-10 16:27:20 -07:00 committed by GitHub
commit 77f86630d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/network/dns.go
View File

@ -421,7 +421,7 @@ var _ = SIGDescribe("DNS", func() {
framework.Failf("ginkgo.Failed to delete pod %s: %v", testAgnhostPod.Name, err) 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) framework.ExpectNoError(err, "failed to wait for pod %s to be running", testAgnhostPod.Name)
runCommand := func(arg string) string { runCommand := func(arg string) string {

2
test/e2e/network/firewall.go
View File

@ -145,7 +145,7 @@ var _ = SIGDescribe("Firewall rule", func() {
pod.Spec.HostNetwork = true pod.Spec.HostNetwork = true
_, err := cs.CoreV1().Pods(ns).Create(pod) _, err := cs.CoreV1().Pods(ns).Create(pod)
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.ExpectNoError(f.WaitForPodRunning(podName)) framework.ExpectNoError(f.WaitForPodReady(podName))
framework.Logf("Netexec pod %q in namespace %q running", podName, ns) framework.Logf("Netexec pod %q in namespace %q running", podName, ns)
defer func() { defer func() {

3
test/e2e/network/service.go
View File

@ -308,7 +308,7 @@ var _ = SIGDescribe("Services", func() {
pod.Labels = jig.Labels pod.Labels = jig.Labels
_, err = cs.CoreV1().Pods(ns).Create(pod) _, err = cs.CoreV1().Pods(ns).Create(pod)
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) framework.ExpectNoError(f.WaitForPodReady(pod.Name))
defer func() { defer func() {
framework.Logf("Cleaning up the echo server pod") framework.Logf("Cleaning up the echo server pod")
err := cs.CoreV1().Pods(ns).Delete(serverPodName, nil) err := cs.CoreV1().Pods(ns).Delete(serverPodName, nil)
@ -366,6 +366,7 @@ var _ = SIGDescribe("Services", func() {
podTemplate.Labels = jig.Labels podTemplate.Labels = jig.Labels
pod, err := cs.CoreV1().Pods(ns).Create(podTemplate) pod, err := cs.CoreV1().Pods(ns).Create(podTemplate)
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.ExpectNoError(f.WaitForPodReady(pod.Name))
ginkgo.By("waiting for the service to expose an endpoint") ginkgo.By("waiting for the service to expose an endpoint")
err = e2eendpoints.ValidateEndpointsPorts(cs, ns, serviceName, e2eendpoints.PortsByPodName{serverPodName: {servicePort}}) err = e2eendpoints.ValidateEndpointsPorts(cs, ns, serviceName, e2eendpoints.PortsByPodName{serverPodName: {servicePort}})