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 #100981 from songxiao-wang87/run-test3

Browse Source 
spelling mistake
This commit is contained in:
Kubernetes Prow Robot 2021-04-22 13:18:40 -07:00 committed by GitHub
commit 1960a7becf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubelet/app/server.go
View File

@ -666,7 +666,7 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
// is it safe do use CAdvisor here ?? // is it safe do use CAdvisor here ??
machineInfo, err := kubeDeps.CAdvisorInterface.MachineInfo() machineInfo, err := kubeDeps.CAdvisorInterface.MachineInfo()
if err != nil { if err != nil {
// if can't use CAdvisor here, fall back to non-explicit cpu list behavor // if can't use CAdvisor here, fall back to non-explicit cpu list behavior
klog.InfoS("Failed to get MachineInfo, set reservedSystemCPUs to empty") klog.InfoS("Failed to get MachineInfo, set reservedSystemCPUs to empty")
reservedSystemCPUs = cpuset.NewCPUSet() reservedSystemCPUs = cpuset.NewCPUSet()
} else { } else {
@ -691,7 +691,7 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
} }
if reservedSystemCPUs.Size() > 0 { if reservedSystemCPUs.Size() > 0 {
// at cmd option valication phase it is tested either --system-reserved-cgroup or --kube-reserved-cgroup is specified, so overwrite should be ok // at cmd option validation phase it is tested either --system-reserved-cgroup or --kube-reserved-cgroup is specified, so overwrite should be ok
klog.InfoS("Option --reserved-cpus is specified, it will overwrite the cpu setting in KubeReserved and SystemReserved", "kubeReservedCPUs", s.KubeReserved, "systemReservedCPUs", s.SystemReserved) klog.InfoS("Option --reserved-cpus is specified, it will overwrite the cpu setting in KubeReserved and SystemReserved", "kubeReservedCPUs", s.KubeReserved, "systemReservedCPUs", s.SystemReserved)
if s.KubeReserved != nil { if s.KubeReserved != nil {
delete(s.KubeReserved, "cpu") delete(s.KubeReserved, "cpu")
@ -1068,7 +1068,7 @@ func InitializeTLS(kf *options.KubeletFlags, kc *kubeletconfiginternal.KubeletCo
return tlsOptions, nil return tlsOptions, nil
} }
// setContentTypeForClient sets the appropritae content type into the rest config // setContentTypeForClient sets the appropriate content type into the rest config
// and handles defaulting AcceptContentTypes based on that input. // and handles defaulting AcceptContentTypes based on that input.
func setContentTypeForClient(cfg *restclient.Config, contentType string) { func setContentTypeForClient(cfg *restclient.Config, contentType string) {
if len(contentType) == 0 { if len(contentType) == 0 {