From 01a6668ece83d559430bb7645328ffb2a35dc492 Mon Sep 17 00:00:00 2001 From: "jianfei.zhang" Date: Mon, 7 Nov 2022 20:25:26 +0800 Subject: [PATCH] fix: Remove dependency on github.com/pkg/errors Signed-off-by: jianfei.zhang --- cmd/kubelet/app/init_windows.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubelet/app/init_windows.go b/cmd/kubelet/app/init_windows.go index 1696f0431b6..f089df77497 100644 --- a/cmd/kubelet/app/init_windows.go +++ b/cmd/kubelet/app/init_windows.go @@ -23,9 +23,9 @@ import ( "fmt" "unsafe" - "github.com/pkg/errors" "golang.org/x/sys/windows" "k8s.io/klog/v2" + "k8s.io/kubernetes/pkg/windows/service" ) @@ -57,7 +57,7 @@ func getPriorityValue(priorityClassName string) uint32 { func createWindowsJobObject(pc uint32) (windows.Handle, error) { job, err := windows.CreateJobObject(nil, nil) if err != nil { - return windows.InvalidHandle, errors.Wrap(err, "windows.CreateJobObject failed") + return windows.InvalidHandle, fmt.Errorf("windows.CreateJobObject failed: %w", err) } limitInfo := windows.JOBOBJECT_BASIC_LIMIT_INFORMATION{ LimitFlags: windows.JOB_OBJECT_LIMIT_PRIORITY_CLASS, @@ -68,7 +68,7 @@ func createWindowsJobObject(pc uint32) (windows.Handle, error) { windows.JobObjectBasicLimitInformation, uintptr(unsafe.Pointer(&limitInfo)), uint32(unsafe.Sizeof(limitInfo))); err != nil { - return windows.InvalidHandle, errors.Wrap(err, "windows.SetInformationJobObject failed") + return windows.InvalidHandle, fmt.Errorf("windows.SetInformationJobObject failed: %w", err) } return job, nil } @@ -85,7 +85,7 @@ func initForOS(windowsService bool, windowsPriorityClass string) error { return err } if err := windows.AssignProcessToJobObject(job, windows.CurrentProcess()); err != nil { - return errors.Wrap(err, "windows.AssignProcessToJobObject failed") + return fmt.Errorf("windows.AssignProcessToJobObject failed: %w", err) } if windowsService {