mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
spelling error server.go.
Signed-off-by: songxiao-wang87 <wang.xiaosong23@zte.com.cn>
This commit is contained in:
parent
a55bd63172
commit
9c880ad907
@ -666,7 +666,7 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
|
||||
// is it safe do use CAdvisor here ??
|
||||
machineInfo, err := kubeDeps.CAdvisorInterface.MachineInfo()
|
||||
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")
|
||||
reservedSystemCPUs = cpuset.NewCPUSet()
|
||||
} else {
|
||||
@ -691,7 +691,7 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
|
||||
}
|
||||
|
||||
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)
|
||||
if s.KubeReserved != nil {
|
||||
delete(s.KubeReserved, "cpu")
|
||||
@ -1068,7 +1068,7 @@ func InitializeTLS(kf *options.KubeletFlags, kc *kubeletconfiginternal.KubeletCo
|
||||
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.
|
||||
func setContentTypeForClient(cfg *restclient.Config, contentType string) {
|
||||
if len(contentType) == 0 {
|
||||
|
Loading…
Reference in New Issue
Block a user