Setting containerd shim cgroup same as pod cgroup

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>

pkg/server/container_start.go

@@ -27,6 +27,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
+	criopts "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"
 )
@@ -142,8 +143,11 @@ func (c *criContainerdService) startContainer(ctx context.Context,
 		}
 		return cntr.IO, nil
 	}
-
-	task, err := container.NewTask(ctx, ioCreation)
+	var taskOpts []containerd.NewTaskOpts
+	if cgroup := sandboxConfig.GetLinux().GetCgroupParent(); cgroup != "" {
+		taskOpts = append(taskOpts, criopts.WithContainerdShimCgroup(cgroup))
+	}
+	task, err := container.NewTask(ctx, ioCreation, taskOpts...)
 	if err != nil {
 		return fmt.Errorf("failed to create containerd task: %v", err)
 	}