Merge pull request #19900 from vishh/kubelet-cpu-cfs

Auto commit by PR queue bot
2016-02-01 15:18:30 -08:00
parent 30375b21d6 214b85e708
commit 4eaffd2477
3 changed files with 3 additions and 3 deletions
--- 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,
--- 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",