Merge pull request #7277 from guenter/cgroup-parent

Add --cgroup_parent flag to Kubelet to set the parent cgroup for pods
This commit is contained in:
Vish Kannan
2015-05-01 10:24:58 -07:00
4 changed files with 22 additions and 4 deletions

View File

@@ -556,6 +556,9 @@ func (dm *DockerManager) runContainer(pod *api.Pod, container *api.Container, op
if len(opts.DNSSearch) > 0 {
hc.DNSSearch = opts.DNSSearch
}
if len(opts.CgroupParent) > 0 {
hc.CgroupParent = opts.CgroupParent
}
if err = dm.client.StartContainer(dockerContainer.ID, hc); err != nil {
if ref != nil {