github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 03:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86214 from shsjshentao/drain

Browse Source 
return success if cordon node by replace
This commit is contained in:
Kubernetes Prow Robot
2020-11-05 06:30:55 -08:00
committed by GitHub
parent 4364ef6206 c825e8ec16
commit dca4d8eb79
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/kubectl/pkg/drain/default.go
View File

@@ -58,11 +58,11 @@ func RunCordonOrUncordon(drainer *Helper, node *corev1.Node, desired bool) error
}
err, patchErr := c.PatchOrReplace(drainer.Client, false)
if patchErr != nil {
return patchErr
}
if err != nil {
return err
if patchErr != nil {
return fmt.Errorf("cordon error: %s; merge patch error: %s", err.Error(), patchErr.Error())
}
return fmt.Errorf("cordon error: %s", err.Error())
}
return nil