github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107764 from heybronson/wrap-error

Browse Source 
wrap error from RunCordonOrUncordon
This commit is contained in:
Kubernetes Prow Robot 2022-02-03 12:22:58 -08:00 committed by GitHub
commit 7efc928dfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/kubectl/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)
if err != 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