Merge pull request #4208 from brendandburns/e2e2

Revert filtering unknown pods, as I believe that it is causing e2e flakes.

Merge pull request #4208 from brendandburns/e2e2
ff4c23d8 · Brendan Burns · c5fcd9d5 · 234f9518 · ff4c23d8
Commit ff4c23d8 authored Feb 05, 2015 by Brendan Burns
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

replication_controller.go pkg/controller/replication_controller.go +1 -2

No files found.
--- a/pkg/controller/replication_controller.go
+++ b/pkg/controller/replication_controller.go
@@ -179,8 +179,7 @@ func FilterActivePods(pods []api.Pod) []api.Pod {
 	var result []api.Pod
 	for _, value := range pods {
 		if api.PodSucceeded != value.Status.Phase &&
-			api.PodFailed != value.Status.Phase &&
-			api.PodUnknown != value.Status.Phase {
+			api.PodFailed != value.Status.Phase {
 			result = append(result, value)
 		}
 	}