Merge pull request #80879 from ravisantoshgudimetla/fix-taint-manager

Wait for pods to be running before eviction starts
This commit is contained in:
Kubernetes Prow Robot 2019-08-05 19:58:07 -07:00 committed by GitHub
commit 3fdf5cf2ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -29,6 +29,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image"
@ -426,6 +427,9 @@ var _ = SIGDescribe("NoExecuteTaintManager Multiple Pods [Serial]", func() {
pod2.Spec.NodeSelector = map[string]string{"kubernetes.io/hostname": nodeHostNameLabel}
_, err = testutils.RunPodAndGetNodeName(cs, pod2, 2*time.Minute)
framework.ExpectNoError(err)
// Wait for pods to be running state before eviction happens
framework.ExpectNoError(e2epod.WaitForPodRunningInNamespace(cs, pod1))
framework.ExpectNoError(e2epod.WaitForPodRunningInNamespace(cs, pod2))
e2elog.Logf("Pod2 is running on %v. Tainting Node", nodeName)
ginkgo.By("Trying to apply a taint on the Node")