From 8d304b7d1e6ed0994ef00b255ac10007499dae34 Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Fri, 8 May 2015 17:51:24 -0700 Subject: [PATCH] Change default CgroupRoot to /. This will make all Docker containers to be top-level containers. This will more equally share the CPU under cases of contention. --- cmd/kubelet/app/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 90a7342d5e1..ed839dedaf4 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -156,7 +156,7 @@ func NewKubeletServer() *KubeletServer { CertDirectory: "/var/run/kubernetes", NodeStatusUpdateFrequency: 10 * time.Second, ResourceContainer: "/kubelet", - CgroupRoot: "", + CgroupRoot: "/", ContainerRuntime: "docker", } } @@ -210,7 +210,7 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.CloudProvider, "cloud-provider", s.CloudProvider, "The provider for cloud services. Empty string for no provider.") fs.StringVar(&s.CloudConfigFile, "cloud-config", s.CloudConfigFile, "The path to the cloud provider configuration file. Empty string for no configuration file.") fs.StringVar(&s.ResourceContainer, "resource-container", s.ResourceContainer, "Absolute name of the resource-only container to create and run the Kubelet in (Default: /kubelet).") - fs.StringVar(&s.CgroupRoot, "cgroup_root", s.CgroupRoot, "Optional root cgroup to use for pods. This is handled by the container runtime on a best effort basis. Default: '', which means use the container runtime default.") + fs.StringVar(&s.CgroupRoot, "cgroup_root", s.CgroupRoot, "Optional root cgroup to use for pods. This is handled by the container runtime on a best effort basis. Default: '/', which means top-level.") fs.StringVar(&s.ContainerRuntime, "container_runtime", s.ContainerRuntime, "The container runtime to use. Possible values: 'docker', 'rkt'. Default: 'docker'.") // Flags intended for testing, not recommended used in production environments. @@ -429,7 +429,7 @@ func SimpleKubelet(client *client.Client, NodeStatusUpdateFrequency: 10 * time.Second, ResourceContainer: "/kubelet", OSInterface: osInterface, - CgroupRoot: "", + CgroupRoot: "/", ContainerRuntime: "docker", Mounter: mount.New(), }