github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113672 from falser101/fix/kubelet_cleanup

Browse Source 
fix: Remove dependency on github.com/pkg/errors
This commit is contained in:
Kubernetes Prow Robot 2022-12-09 14:34:19 -08:00 committed by GitHub
commit 6c0f680be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kubelet/app/init_windows.go
View File

@ -23,9 +23,9 @@ import (
"fmt" "fmt"
"unsafe" "unsafe"
"github.com/pkg/errors"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/windows/service" "k8s.io/kubernetes/pkg/windows/service"
) )
@ -57,7 +57,7 @@ func getPriorityValue(priorityClassName string) uint32 {
func createWindowsJobObject(pc uint32) (windows.Handle, error) { func createWindowsJobObject(pc uint32) (windows.Handle, error) {
job, err := windows.CreateJobObject(nil, nil) job, err := windows.CreateJobObject(nil, nil)
if err != 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{ limitInfo := windows.JOBOBJECT_BASIC_LIMIT_INFORMATION{
LimitFlags: windows.JOB_OBJECT_LIMIT_PRIORITY_CLASS, LimitFlags: windows.JOB_OBJECT_LIMIT_PRIORITY_CLASS,
@ -68,7 +68,7 @@ func createWindowsJobObject(pc uint32) (windows.Handle, error) {
windows.JobObjectBasicLimitInformation, windows.JobObjectBasicLimitInformation,
uintptr(unsafe.Pointer(&limitInfo)), uintptr(unsafe.Pointer(&limitInfo)),
uint32(unsafe.Sizeof(limitInfo))); err != nil { 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 return job, nil
} }
@ -85,7 +85,7 @@ func initForOS(windowsService bool, windowsPriorityClass string) error {
return err return err
} }
if err := windows.AssignProcessToJobObject(job, windows.CurrentProcess()); err != nil { 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 { if windowsService {