github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-01 15:18:30 -08:00
commit 4eaffd2477
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubelet/app/options/options.go
View File

@ -73,7 +73,7 @@ func NewKubeletServer() *KubeletServer {
CgroupRoot: "", CgroupRoot: "",
ConfigureCBR0: false, ConfigureCBR0: false,
ContainerRuntime: "docker", ContainerRuntime: "docker",
CPUCFSQuota: false, CPUCFSQuota: true,
DockerExecHandlerName: "native", DockerExecHandlerName: "native",
EventBurst: 10, EventBurst: 10,
EventRecordQPS: 5.0, EventRecordQPS: 5.0,

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

@ -484,7 +484,7 @@ func SimpleKubelet(client *client.Client,
ConfigFile: configFilePath, ConfigFile: configFilePath,
ContainerManager: containerManager, ContainerManager: containerManager,
ContainerRuntime: "docker", ContainerRuntime: "docker",
CPUCFSQuota: false, CPUCFSQuota: true,
DiskSpacePolicy: diskSpacePolicy, DiskSpacePolicy: diskSpacePolicy,
DockerClient: dockerClient, DockerClient: dockerClient,
DockerDaemonContainer: "/docker-daemon", DockerDaemonContainer: "/docker-daemon",

2
docs/admin/kubelet.md
View File

@ -79,7 +79,7 @@ kubelet
--configure-cbr0[=false]: If true, kubelet will configure cbr0 based on Node.Spec.PodCIDR. --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'. --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] --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-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'. --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 --enable-debugging-handlers[=true]: Enables server endpoints for log collection and local running of containers and commands