github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47270 from derekwaynecarr/fix-drain

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-06-09 20:52:31 -07:00 committed by GitHub
commit 1168552fad
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/drain.go
View File

@ -544,7 +544,7 @@ func (o *DrainOptions) deletePods(pods []api.Pod, getPodFn func(namespace, name
} }
for _, pod := range pods { for _, pod := range pods {
err := o.deletePod(pod) err := o.deletePod(pod)
if err != nil { if err != nil && !apierrors.IsNotFound(err) {
return err return err
} }
} }