diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain.go index 5bd433a85f78..c9244e895a2e 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain.go @@ -494,9 +494,12 @@ func (o *DrainOptions) evictPods(pods []api.Pod, policyGroupVersion string, getP err = o.evictPod(pod, policyGroupVersion) if err == nil { break + } else if apierrors.IsNotFound(err) { + doneCh <- true + return } else if apierrors.IsTooManyRequests(err) { time.Sleep(5 * time.Second) - } else if !apierrors.IsNotFound(err) { + } else { errCh <- fmt.Errorf("error when evicting pod %q: %v", pod.Name, err) return }