github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Setting containerd shim cgroup same as pod cgroup

Browse Source 
Signed-off-by: abhi <abhi@docker.com>
This commit is contained in:
abhi
2017-11-30 16:26:01 -08:00
parent 0db6e04ba1
commit 0d6774f4af
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/server/sandbox_run.go
View File

@@ -36,6 +36,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
customopts "github.com/kubernetes-incubator/cri-containerd/pkg/containerd/opts"
criopts "github.com/kubernetes-incubator/cri-containerd/pkg/opts"
sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
"github.com/kubernetes-incubator/cri-containerd/pkg/util"
)
@@ -205,9 +206,13 @@ func (c *criContainerdService) RunPodSandbox(ctx context.Context, r *runtime.Run
glog.V(5).Infof("Create sandbox container (id=%q, name=%q).",
id, name)
// We don't need stdio for sandbox container.
task, err := container.NewTask(ctx, containerdio.NullIO)
var taskOpts []containerd.NewTaskOpts
if cgroup := config.GetLinux().GetCgroupParent(); cgroup != "" {
taskOpts = append(taskOpts, criopts.WithContainerdShimCgroup(cgroup))
}
task, err := container.NewTask(ctx, containerdio.NullIO, taskOpts...)
if err != nil {
return nil, fmt.Errorf("failed to create task for sandbox %q: %v", id, err)
return nil, fmt.Errorf("failed to create containerd task: %v", err)
}
defer func() {
if retErr != nil {