Merge pull request #74847 from draveness/feature/filter-active-pods

refactor: use controller.FilterActivePods in test/e2e/framework/util.go
This commit is contained in:
Kubernetes Prow Robot 2019-07-01 11:07:20 -07:00 committed by GitHub
commit f2c4237605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -566,13 +566,7 @@ func WaitForPodsInactive(ps *testutils.PodStore, interval, timeout time.Duration
var activePods []*v1.Pod
err := wait.PollImmediate(interval, timeout, func() (bool, error) {
pods := ps.List()
activePods = nil
for _, pod := range pods {
if controller.IsPodActive(pod) {
activePods = append(activePods, pod)
}
}
activePods = controller.FilterActivePods(pods)
if len(activePods) != 0 {
return false, nil
}