From 214b85e7088bcf87042477535081ec91ba3f5037 Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Wed, 20 Jan 2016 17:32:17 -0800 Subject: [PATCH] Enable CPU CFS quota by default. Signed-off-by: Vishnu kannan --- cmd/kubelet/app/options/options.go | 2 +- cmd/kubelet/app/server.go | 2 +- docs/admin/kubelet.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index ef985ae8790..e963891f7f8 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 32d9599ad63..a298613859f 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -489,7 +489,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 42a99a7aca7..57be35545c7 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 @@ -145,7 +145,7 @@ kubelet --volume-plugin-dir="/usr/libexec/kubernetes/kubelet-plugins/volume/exec/": The full path of the directory in which to search for additional third party volume plugins ``` -###### Auto generated by spf13/cobra on 15-Jan-2016 +###### Auto generated by spf13/cobra on 21-Jan-2016