Merge pull request #42055 from derekwaynecarr/sandbox-cgroup-parent

Automatic merge from submit-queue (batch tested with PRs 41962, 42055, 42062, 42019, 42054) dockershim puts pause container in pod cgroup **What this PR does / why we need it**: The CRI was not launching the pause container in the pod level cgroup. The non-CRI code path was.

Merge pull request #42055 from derekwaynecarr/sandbox-cgroup-parent
bc650d7e · Kubernetes Submit Queue · GitHub · 05f3c715 · 0449b008 · bc650d7e
Commit bc650d7e authored Feb 27, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

docker_sandbox.go pkg/kubelet/dockershim/docker_sandbox.go +10 -0

No files found.
--- a/pkg/kubelet/dockershim/docker_sandbox.go
+++ b/pkg/kubelet/dockershim/docker_sandbox.go
@@ -470,6 +470,16 @@ func (ds *dockerService) makeSandboxDockerConfig(c *runtimeapi.PodSandboxConfig,
 	// Apply resource options.
 	setSandboxResources(hc)

+	// Apply cgroupsParent derived from the sandbox config.
+	if lc := c.GetLinux(); lc != nil {
+		// Apply Cgroup options.
+		cgroupParent, err := ds.GenerateExpectedCgroupParent(lc.CgroupParent)
+		if err != nil {
+			return nil, fmt.Errorf("failed to generate cgroup parent in expected syntax for container %q: %v", c.Metadata.Name, err)
+		}
+		hc.CgroupParent = cgroupParent
+	}
+
 	// Set security options.
 	securityOpts, err := getSandboxSecurityOpts(c, ds.seccompProfileRoot, securityOptSep)
 	if err != nil {