Revert: Setting containerd shim cgroup same as pod cgroup

Signed-off-by: abhi <abhi@docker.com>
This commit is contained in:
abhi
2017-12-01 16:03:38 -08:00
parent cad87243e1
commit 43c05efb22
2 changed files with 2 additions and 11 deletions

View File

@@ -205,11 +205,7 @@ 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.
var taskOpts []containerd.NewTaskOpts
if cgroup := config.GetLinux().GetCgroupParent(); cgroup != "" {
taskOpts = append(taskOpts, customopts.WithContainerdShimCgroup(cgroup))
}
task, err := container.NewTask(ctx, containerdio.NullIO, taskOpts...)
task, err := container.NewTask(ctx, containerdio.NullIO)
if err != nil {
return nil, fmt.Errorf("failed to create containerd task: %v", err)
}