From 43c05efb22d101f2a69ee29b256bad4f9272190f Mon Sep 17 00:00:00 2001 From: abhi Date: Fri, 1 Dec 2017 16:03:38 -0800 Subject: [PATCH] Revert: Setting containerd shim cgroup same as pod cgroup Signed-off-by: abhi --- pkg/server/container_start.go | 7 +------ pkg/server/sandbox_run.go | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkg/server/container_start.go b/pkg/server/container_start.go index b362aa430..a03d5c7ed 100644 --- a/pkg/server/container_start.go +++ b/pkg/server/container_start.go @@ -27,7 +27,6 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - customopts "github.com/kubernetes-incubator/cri-containerd/pkg/containerd/opts" cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" ) @@ -127,11 +126,7 @@ func (c *criContainerdService) startContainer(ctx context.Context, return cntr.IO, nil } - var taskOpts []containerd.NewTaskOpts - if cgroup := sandbox.Config.GetLinux().GetCgroupParent(); cgroup != "" { - taskOpts = append(taskOpts, customopts.WithContainerdShimCgroup(cgroup)) - } - task, err := container.NewTask(ctx, ioCreation, taskOpts...) + task, err := container.NewTask(ctx, ioCreation) if err != nil { return fmt.Errorf("failed to create containerd task: %v", err) } diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go index 9675f1346..832b28664 100644 --- a/pkg/server/sandbox_run.go +++ b/pkg/server/sandbox_run.go @@ -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) }