Fix cgroups path for base OCI spec

mxpv · mxpv · commit 17c61e36cb5e · 2020-05-29T11:40:12.000-07:00
Signed-off-by: Maksym Pavlenko &lt;pavlenko.maksym@gmail.com&gt;
diff --git a/pkg/server/container_create.go b/pkg/server/container_create.go
@@ -313,7 +313,10 @@ func (c *criService) runtimeSpec(id string, baseSpecFile string, opts ...oci.Spe
 			return nil, errors.Wrap(err, "failed to clone OCI spec")
 		}
 
-		if err := oci.ApplyOpts(ctx, nil, container, &spec, opts...); err != nil {
+		// Fix up cgroups path
+		applyOpts := append([]oci.SpecOpts{oci.WithNamespacedCgroup()}, opts...)
+
+		if err := oci.ApplyOpts(ctx, nil, container, &spec, applyOpts...); err != nil {
 			return nil, errors.Wrap(err, "failed to apply OCI options")
 		}
 
diff --git a/pkg/server/container_create_test.go b/pkg/server/container_create_test.go
@@ -29,6 +29,7 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	"github.com/containerd/cri/pkg/config"
+	"github.com/containerd/cri/pkg/constants"
 	"github.com/containerd/cri/pkg/containerd/opts"
 )
 
@@ -401,4 +402,6 @@ func TestBaseRuntimeSpec(t *testing.T) {
 	// Make sure original base spec not changed
 	assert.NotEqual(t, out, c.baseOCISpecs["/etc/containerd/cri-base.json"])
 	assert.Equal(t, c.baseOCISpecs["/etc/containerd/cri-base.json"].Hostname, "old")
+
+	assert.Equal(t, filepath.Join("/", constants.K8sContainerdNamespace, "id1"), out.Linux.CgroupsPath)
 }

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,10 @@ func (c *criService) runtimeSpec(id string, baseSpecFile string, opts ...oci.Spe`
`313`	`313`	`return nil, errors.Wrap(err, "failed to clone OCI spec")`
`314`	`314`	`}`
`315`	`315`
`316`		`- if err := oci.ApplyOpts(ctx, nil, container, &spec, opts...); err != nil {`
	`316`	`+ // Fix up cgroups path`
	`317`	`+ applyOpts := append([]oci.SpecOpts{oci.WithNamespacedCgroup()}, opts...)`
	`318`	`+`
	`319`	`+ if err := oci.ApplyOpts(ctx, nil, container, &spec, applyOpts...); err != nil {`
`317`	`320`	`return nil, errors.Wrap(err, "failed to apply OCI options")`
`318`	`321`	`}`
`319`	`322`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import (`
`29`	`29`	`runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"`
`30`	`30`
`31`	`31`	`"github.com/containerd/cri/pkg/config"`
	`32`	`+ "github.com/containerd/cri/pkg/constants"`
`32`	`33`	`"github.com/containerd/cri/pkg/containerd/opts"`
`33`	`34`	`)`
`34`	`35`
`@@ -401,4 +402,6 @@ func TestBaseRuntimeSpec(t *testing.T) {`
`401`	`402`	`// Make sure original base spec not changed`
`402`	`403`	`assert.NotEqual(t, out, c.baseOCISpecs["/etc/containerd/cri-base.json"])`
`403`	`404`	`assert.Equal(t, c.baseOCISpecs["/etc/containerd/cri-base.json"].Hostname, "old")`
	`405`	`+`
	`406`	`+ assert.Equal(t, filepath.Join("/", constants.K8sContainerdNamespace, "id1"), out.Linux.CgroupsPath)`
`404`	`407`	`}`