github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Revert "Setting containerd shim cgroup same as pod cgroup"

Browse Source 
This reverts commit 59008c608e.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2017-09-02 04:20:42 +00:00
parent d0126752d2
commit c3cb1cfde8
3 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/server/container_start.go
View File

@@ -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)
}