From f10cc5836205d0964c560ecce14a5af9469d9daf Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Fri, 27 Oct 2017 05:20:16 +0000
Subject: [PATCH] Revert "Put containerd-shim into pod cgroup"

This reverts commit e9cf1d5909f35cd735e4b3bceb491667c63da0d4.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 pkg/opts/task.go              | 22 ----------------------
 pkg/server/container_start.go |  8 +-------
 pkg/server/sandbox_run.go     |  6 +-----
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 pkg/opts/task.go

diff --git a/pkg/opts/task.go b/pkg/opts/task.go
deleted file mode 100644
index f2753b559..000000000
--- a/pkg/opts/task.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package opts
-
-import (
-	"context"
-
-	"github.com/containerd/containerd"
-	"github.com/containerd/containerd/linux/runcopts"
-)
-
-// WithContainerdShimCgroup returns function that sets the containerd
-// shim cgroup path
-func WithContainerdShimCgroup(path string) containerd.NewTaskOpts {
-	return func(_ context.Context, _ *containerd.Client, r *containerd.TaskInfo) error {
-		r.Options = &runcopts.CreateOptions{
-			ShimCgroup: path,
-		}
-		return nil
-	}
-}
-
-//TODO: Since Options is an interface different WithXXX will be needed to set different
-// combinations of CreateOptions.
diff --git a/pkg/server/container_start.go b/pkg/server/container_start.go
index 82e527d3a..e2fb5b871 100644
--- a/pkg/server/container_start.go
+++ b/pkg/server/container_start.go
@@ -26,7 +26,6 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	customopts "github.com/kubernetes-incubator/cri-containerd/pkg/opts"
 	cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io"
 	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
 )
@@ -128,12 +127,7 @@ func (c *criContainerdService) startContainer(ctx context.Context,
 		return cntr.IO, nil
 	}
 
-	var taskOpts []containerd.NewTaskOpts
-	cgroup := sandbox.Config.GetLinux().GetCgroupParent()
-	if 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 a82799eec..3af3f40f8 100644
--- a/pkg/server/sandbox_run.go
+++ b/pkg/server/sandbox_run.go
@@ -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)
 	}