github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix cgroupParent is wrongly set in dockershim

Browse Source
This commit is contained in:
Harry Zhang 2016-12-09 09:08:56 +00:00
parent ae1a7784af
commit 9170e94e2d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/dockershim/docker_container.go
View File

@ -124,14 +124,6 @@ func (ds *dockerService) CreateContainer(podSandboxID string, config *runtimeapi
Binds: generateMountBindings(config.GetMounts()), Binds: generateMountBindings(config.GetMounts()),
} }
// Apply cgroupsParent derived from the sandbox config.
if lc := sandboxConfig.GetLinux(); lc != nil {
// Apply Cgroup options.
// TODO: Check if this works with per-pod cgroups.
// TODO: we need to pass the cgroup in syntax expected by cgroup driver but shim does not use docker info yet...
hc.CgroupParent = lc.GetCgroupParent()
}
// Apply Linux-specific options if applicable. // Apply Linux-specific options if applicable.
if lc := config.GetLinux(); lc != nil { if lc := config.GetLinux(); lc != nil {
// Apply resource options. // Apply resource options.
@ -154,6 +146,14 @@ func (ds *dockerService) CreateContainer(podSandboxID string, config *runtimeapi
applyContainerSecurityContext(lc, podSandboxID, createConfig.Config, hc) applyContainerSecurityContext(lc, podSandboxID, createConfig.Config, hc)
} }
// Apply cgroupsParent derived from the sandbox config.
if lc := sandboxConfig.GetLinux(); lc != nil {
// Apply Cgroup options.
// TODO: Check if this works with per-pod cgroups.
// TODO: we need to pass the cgroup in syntax expected by cgroup driver but shim does not use docker info yet...
hc.CgroupParent = lc.GetCgroupParent()
}
// Set devices for container. // Set devices for container.
devices := make([]dockercontainer.DeviceMapping, len(config.Devices)) devices := make([]dockercontainer.DeviceMapping, len(config.Devices))
for i, device := range config.Devices { for i, device := range config.Devices {