diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index ef2116fcb2f..58e4729e280 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -73,7 +73,7 @@ func NewKubeletServer() *KubeletServer { CgroupRoot: "", ConfigureCBR0: false, ContainerRuntime: "docker", - CPUCFSQuota: false, + CPUCFSQuota: true, DockerExecHandlerName: "native", EventBurst: 10, EventRecordQPS: 5.0, diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index acc69001a0f..87101f9f3dc 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -484,7 +484,7 @@ func SimpleKubelet(client *client.Client, ConfigFile: configFilePath, ContainerManager: containerManager, ContainerRuntime: "docker", - CPUCFSQuota: false, + CPUCFSQuota: true, DiskSpacePolicy: diskSpacePolicy, DockerClient: dockerClient, DockerDaemonContainer: "/docker-daemon", diff --git a/docs/admin/kubelet.md b/docs/admin/kubelet.md index 58784f82720..9d51184eac7 100644 --- a/docs/admin/kubelet.md +++ b/docs/admin/kubelet.md @@ -79,7 +79,7 @@ kubelet --configure-cbr0[=false]: If true, kubelet will configure cbr0 based on Node.Spec.PodCIDR. --container-runtime="docker": The container runtime to use. Possible values: 'docker', 'rkt'. Default: 'docker'. --containerized[=false]: Experimental support for running kubelet in a container. Intended for testing. [default=false] - --cpu-cfs-quota[=false]: Enable CPU CFS quota enforcement for containers that specify CPU limits + --cpu-cfs-quota[=true]: Enable CPU CFS quota enforcement for containers that specify CPU limits --docker-endpoint="": If non-empty, use this for the docker endpoint to communicate with --docker-exec-handler="native": Handler to use when executing a command in a container. Valid values are 'native' and 'nsenter'. Defaults to 'native'. --enable-debugging-handlers[=true]: Enables server endpoints for log collection and local running of containers and commands