From c3cb1cfde82a1509f78f1e1be39844aa842ceb36 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Sat, 2 Sep 2017 04:20:42 +0000 Subject: [PATCH] Revert "Setting containerd shim cgroup same as pod cgroup" This reverts commit 59008c608e90fdc0b57c468489a792bc56fdaa5b. Signed-off-by: Lantao Liu --- pkg/opts/task.go | 22 ---------------------- pkg/server/container_start.go | 8 ++------ pkg/server/sandbox_run.go | 8 ++------ 3 files changed, 4 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 983a2143e..0d500997e 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" - 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" ) @@ -143,11 +142,8 @@ func (c *criContainerdService) startContainer(ctx context.Context, } return cntr.IO, nil } - var taskOpts []containerd.NewTaskOpts - if cgroup := sandboxConfig.GetLinux().GetCgroupParent(); cgroup != "" { - taskOpts = append(taskOpts, criopts.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 2f1302135..3c6607cdd 100644 --- a/pkg/server/sandbox_run.go +++ b/pkg/server/sandbox_run.go @@ -31,7 +31,6 @@ import ( "golang.org/x/sys/unix" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - criopts "github.com/kubernetes-incubator/cri-containerd/pkg/opts" sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" "github.com/kubernetes-incubator/cri-containerd/pkg/util" ) @@ -182,11 +181,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, criopts.WithContainerdShimCgroup(cgroup)) - } - 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) } @@ -258,6 +253,7 @@ func (c *criContainerdService) generateSandboxContainerSpec(id string, config *r // When cgroup parent is not set, containerd-shim will create container in a child cgroup // of the cgroup itself is in. // TODO(random-liu): [P2] Set default cgroup path if cgroup parent is not specified. + // Set namespace options. securityContext := config.GetLinux().GetSecurityContext() nsOptions := securityContext.GetNamespaceOptions()