Merge pull request kubernetes#89182 from dims/just-use-runtime-numcpu

Just use runtime.NumCPU on windows

Author: k8s-ci-robot

pkg/kubelet/dockershim/BUILD

@@ -78,7 +78,6 @@ go_library(
             "//pkg/kubelet/apis:go_default_library",
             "//pkg/kubelet/winstats:go_default_library",
             "//vendor/github.com/Microsoft/hcsshim:go_default_library",
-            "//vendor/github.com/docker/docker/pkg/sysinfo:go_default_library",
             "//vendor/golang.org/x/sys/windows/registry:go_default_library",
         ],
         "//conditions:default": [],

pkg/kubelet/dockershim/helpers_windows.go

@@ -20,12 +20,12 @@ package dockershim
 
 import (
 	"os"
+	"runtime"
 
 	"github.com/blang/semver"
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockerfilters "github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/pkg/sysinfo"
 	"k8s.io/klog"
 
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
@@ -75,7 +75,7 @@ func (ds *dockerService) updateCreateConfig(
 				Memory:    rOpts.MemoryLimitInBytes,
 				CPUShares: rOpts.CpuShares,
 				CPUCount:  rOpts.CpuCount,
-				NanoCPUs:  rOpts.CpuMaximum * int64(sysinfo.NumCPU()) * (1e9 / 10000),
+				NanoCPUs:  rOpts.CpuMaximum * int64(runtime.NumCPU()) * (1e9 / 10000),
 			}
 		}
 

pkg/kubelet/kuberuntime/BUILD

@@ -83,7 +83,6 @@ go_library(
         ],
         "@io_bazel_rules_go//go/platform:windows": [
             "//pkg/kubelet/apis:go_default_library",
-            "//vendor/github.com/docker/docker/pkg/sysinfo:go_default_library",
         ],
         "//conditions:default": [],
     }),

pkg/kubelet/kuberuntime/kuberuntime_container_windows.go

@@ -20,8 +20,7 @@ package kuberuntime
 
 import (
 	"fmt"
-
-	"github.com/docker/docker/pkg/sysinfo"
+	"runtime"
 
 	"k8s.io/api/core/v1"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -85,7 +84,7 @@ func (m *kubeGenericRuntimeManager) generateWindowsContainerConfig(container *v1
 		//   https://github.com/opencontainers/runtime-spec/blob/ad53dcdc39f1f7f7472b10aa0a45648fe4865496/config-windows.md#cpu
 		//   If both CpuWeight and CpuMaximum are set - ContainerD catches this invalid case and returns an error instead.
 
-		cpuMaximum := 10000 * cpuLimit.MilliValue() / int64(sysinfo.NumCPU()) / 1000
+		cpuMaximum := 10000 * cpuLimit.MilliValue() / int64(runtime.NumCPU()) / 1000
 
 		// TODO: This should be reviewed or removed once Hyper-V support is implemented with CRI-ContainerD
 		//       in a future release. cpuCount may or may not be required if cpuMaximum is set.

vendor/BUILD

@@ -116,9 +116,8 @@ filegroup(
         "//vendor/github.com/docker/docker/errdefs:all-srcs",
         "//vendor/github.com/docker/docker/pkg/jsonmessage:all-srcs",
         "//vendor/github.com/docker/docker/pkg/mount:all-srcs",
-        "//vendor/github.com/docker/docker/pkg/parsers:all-srcs",
+        "//vendor/github.com/docker/docker/pkg/parsers/operatingsystem:all-srcs",
         "//vendor/github.com/docker/docker/pkg/stdcopy:all-srcs",
-        "//vendor/github.com/docker/docker/pkg/sysinfo:all-srcs",
         "//vendor/github.com/docker/docker/pkg/term:all-srcs",
         "//vendor/github.com/docker/go-connections/nat:all-srcs",
         "//vendor/github.com/docker/go-connections/sockets:all-srcs",