kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107764 from heybronson/wrap-error 

wrap error from RunCordonOrUncordon

Kubernetes-commit: 7efc928dfa3ad88b5efa880eca5abe1be6550fd0
This commit is contained in:
Kubernetes Publisher 2022-02-03 12:22:58 -08:00
parent 7596f27f2f 1d62bce235
commit f348ed572e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/drain/default.go
View File

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