From 9cff11dbb05b285ca78f3a9813d416696f678fb7 Mon Sep 17 00:00:00 2001
From: Michael Fraenkel <fraenkel@us.ibm.com>
Date: Tue, 30 Aug 2016 21:31:42 -0400
Subject: [PATCH] Finished pods can be drained

- Don't bother trying to filter pods that have succeeded or failed
---
 pkg/kubectl/cmd/drain.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/kubectl/cmd/drain.go b/pkg/kubectl/cmd/drain.go
index 19d5e7bca2f..8826db24015 100644
--- a/pkg/kubectl/cmd/drain.go
+++ b/pkg/kubectl/cmd/drain.go
@@ -260,6 +260,11 @@ func (o *DrainOptions) getPodCreator(pod api.Pod) (*api.SerializedReference, err
 }
 
 func (o *DrainOptions) unreplicatedFilter(pod api.Pod) (bool, *warning, *fatal) {
+	// any finished pod can be removed
+	if pod.Status.Phase == api.PodSucceeded || pod.Status.Phase == api.PodFailed {
+		return true, nil, nil
+	}
+
 	sr, err := o.getPodCreator(pod)
 	if err != nil {
 		return false, nil, &fatal{err.Error()}