Merge pull request #4169 from brendandburns/shell_sucks

Fix a regression where we never cleared out failed nodes.
2015-02-05 13:41:11 -08:00
parent c1ca07338f 6d0b8ea7a7
commit 7a13c2f0e3
3 changed files with 41 additions and 1 deletions
--- a/pkg/controller/replication_controller.go
+++ b/pkg/controller/replication_controller.go
@@ -179,7 +179,8 @@ 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.PodFailed != value.Status.Phase &&
+			api.PodUnknown != value.Status.Phase {
 			result = append(result, value)
 		}
 	}