From 297432f0e92479cfbb62d182d9d20c1833a3521c Mon Sep 17 00:00:00 2001 From: Bronson Mirafuentes Date: Tue, 25 Jan 2022 10:34:47 -0800 Subject: [PATCH] wrap error from RunCordonOrUncordon --- staging/src/k8s.io/kubectl/pkg/drain/default.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/drain/default.go b/staging/src/k8s.io/kubectl/pkg/drain/default.go index 43f5dc42ca0..1dff2ea11dd 100644 --- a/staging/src/k8s.io/kubectl/pkg/drain/default.go +++ b/staging/src/k8s.io/kubectl/pkg/drain/default.go @@ -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