Merge pull request #47270 from derekwaynecarr/fix-drain

Automatic merge from submit-queue kubectl drain errors if pod is already deleted **What this PR does / why we need it**: kubectl drain can throw an error if the pod it attempts to delete has already been deleted. fixes https://github.com/kubernetes/kubectl/issues/28

Merge pull request #47270 from derekwaynecarr/fix-drain
1168552f · Kubernetes Submit Queue · GitHub · 9df40c36 · 1dc4d779 · 1168552f
Commit 1168552f authored Jun 09, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drain.go pkg/kubectl/cmd/drain.go +1 -1

No files found.
--- a/pkg/kubectl/cmd/drain.go
+++ b/pkg/kubectl/cmd/drain.go
@@ -544,7 +544,7 @@ func (o *DrainOptions) deletePods(pods []api.Pod, getPodFn func(namespace, name 
 	}
 	for _, pod := range pods {
 		err := o.deletePod(pod)
-		if err != nil {
+		if err != nil && !apierrors.IsNotFound(err) {
 			return err
 		}
 	}