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

Revert "Put containerd-shim into pod cgroup"

Browse Source 
This reverts commit e9cf1d5909.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2017-10-27 05:20:16 +00:00
parent 486d7628c0
commit f10cc58362
3 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/server/sandbox_run.go
View File

@@ -201,12 +201,8 @@ func (c *criContainerdService) RunPodSandbox(ctx context.Context, r *runtime.Run
// Create sandbox task in containerd.
glog.V(5).Infof("Create sandbox container (id=%q, name=%q).",
id, name)
var taskOpts []containerd.NewTaskOpts
if cgroup := sandbox.Config.GetLinux().GetCgroupParent(); cgroup != "" {
taskOpts = append(taskOpts, customopts.WithContainerdShimCgroup(cgroup))
}
// We don't need stdio for sandbox container.
task, err := container.NewTask(ctx, containerd.NullIO, taskOpts...)
task, err := container.NewTask(ctx, containerd.NullIO)
if err != nil {
return nil, fmt.Errorf("failed to create task for sandbox %q: %v", id, err)
}