From 2aaa4e08ebea67cba21adeda46940b3affa6040e Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Wed, 13 May 2015 15:50:23 -0700 Subject: [PATCH] Revert "Change default CgroupRoot to /." --- 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 1f67e225abd..c4dcd7daf4c 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -163,7 +163,7 @@ func NewKubeletServer() *KubeletServer { CertDirectory: "/var/run/kubernetes", NodeStatusUpdateFrequency: 10 * time.Second, ResourceContainer: "/kubelet", - CgroupRoot: "/", + CgroupRoot: "", ContainerRuntime: "docker", DockerDaemonContainer: "/docker-daemon", } @@ -220,7 +220,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 top-level.") + 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.ContainerRuntime, "container_runtime", s.ContainerRuntime, "The container runtime to use. Possible values: 'docker', 'rkt'. Default: 'docker'.") fs.StringVar(&s.DockerDaemonContainer, "docker-daemon-container", s.DockerDaemonContainer, "Optional resource-only container in which to place the Docker Daemon. Empty for no container (Default: /docker-daemon).") @@ -492,7 +492,7 @@ func SimpleKubelet(client *client.Client, NodeStatusUpdateFrequency: 10 * time.Second, ResourceContainer: "/kubelet", OSInterface: osInterface, - CgroupRoot: "/", + CgroupRoot: "", ContainerRuntime: "docker", Mounter: mount.New(), DockerDaemonContainer: "/docker-daemon",