github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34490 from yujuhong/docker_cgroup

Browse Source 
Automatic merge from submit-queue

dockershim: move docker to the given cgroup
This commit is contained in:
Kubernetes Submit Queue
2016-11-02 00:30:30 -07:00
committed by GitHub
parent 07f78836ea 87aaf4c0ac
commit 6e90106ded
10 changed files with 297 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,13 +435,14 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) {
return fmt.Errorf("invalid configuration: system container was specified and cgroup root was not specified")
}
kubeDeps.ContainerManager, err = cm.NewContainerManager(kubeDeps.Mounter, kubeDeps.CAdvisorInterface, cm.NodeConfig{
RuntimeCgroupsName: s.RuntimeCgroups,
SystemCgroupsName: s.SystemCgroups,
KubeletCgroupsName: s.KubeletCgroups,
ContainerRuntime: s.ContainerRuntime,
CgroupsPerQOS: s.CgroupsPerQOS,
CgroupRoot: s.CgroupRoot,
ProtectKernelDefaults: s.ProtectKernelDefaults,
RuntimeCgroupsName: s.RuntimeCgroups,
SystemCgroupsName: s.SystemCgroups,
KubeletCgroupsName: s.KubeletCgroups,
ContainerRuntime: s.ContainerRuntime,
CgroupsPerQOS: s.CgroupsPerQOS,
CgroupRoot: s.CgroupRoot,
ProtectKernelDefaults: s.ProtectKernelDefaults,
RuntimeIntegrationType: s.ExperimentalRuntimeIntegrationType,
})
if err != nil {
return err