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

Revert: Setting containerd shim cgroup same as pod cgroup

Browse Source 
Signed-off-by: abhi <abhi@docker.com>
This commit is contained in:
abhi 2017-12-01 16:03:38 -08:00
parent cad87243e1
commit 43c05efb22
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/server/container_start.go
View File

@ -27,7 +27,6 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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" cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io"
containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" 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 return cntr.IO, nil
} }
var taskOpts []containerd.NewTaskOpts task, err := container.NewTask(ctx, ioCreation)
if cgroup := sandbox.Config.GetLinux().GetCgroupParent(); cgroup != "" {
taskOpts = append(taskOpts, customopts.WithContainerdShimCgroup(cgroup))
}
task, err := container.NewTask(ctx, ioCreation, taskOpts...)
if err != nil { if err != nil {
return fmt.Errorf("failed to create containerd task: %v", err) return fmt.Errorf("failed to create containerd task: %v", err)
} }

6
pkg/server/sandbox_run.go
View File

@ -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).", glog.V(5).Infof("Create sandbox container (id=%q, name=%q).",
id, name) id, name)
// We don't need stdio for sandbox container. // We don't need stdio for sandbox container.
var taskOpts []containerd.NewTaskOpts task, err := container.NewTask(ctx, containerdio.NullIO)
if cgroup := config.GetLinux().GetCgroupParent(); cgroup != "" {
taskOpts = append(taskOpts, customopts.WithContainerdShimCgroup(cgroup))
}
task, err := container.NewTask(ctx, containerdio.NullIO, taskOpts...)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create containerd task: %v", err) return nil, fmt.Errorf("failed to create containerd task: %v", err)
} }