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

@@ -195,6 +195,8 @@ type RunContainerOptions struct {
// into docker's container runtime.
NetMode string
IpcMode string
// The parent cgroup to pass to Docker
CgroupParent string
}
type Pods []*Pod