github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 13:07:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86366 from mortent/DeflakePDBTest

Browse Source 
Change PDB tests to use pod conditions instead of phase
This commit is contained in:
Kubernetes Prow Robot 2020-01-08 19:11:39 -08:00 committed by GitHub
commit 61cf95f2a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/apps/disruption.go
View File

@ -31,6 +31,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/util/retry" "k8s.io/client-go/util/retry"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
imageutils "k8s.io/kubernetes/test/utils/image" imageutils "k8s.io/kubernetes/test/utils/image"
) )
@ -314,8 +315,9 @@ func waitForPodsOrDie(cs kubernetes.Interface, ns string, n int) {
return false, nil return false, nil
} }
ready := 0 ready := 0
for i := 0; i < n; i++ { for i := range pods.Items {
if pods.Items[i].Status.Phase == v1.PodRunning { pod := pods.Items[i]
if podutil.IsPodReady(&pod) {
ready++ ready++
} }
} }
@ -373,8 +375,9 @@ func locateRunningPod(cs kubernetes.Interface, ns string) (pod *v1.Pod, err erro
} }
for i := range podList.Items { for i := range podList.Items {
if podList.Items[i].Status.Phase == v1.PodRunning { p := podList.Items[i]
pod = &podList.Items[i] if podutil.IsPodReady(&p) {
pod = &p
return true, nil return true, nil
} }
} }