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

Use github.com/containerd/cgroups/v3 to remove gogo

Browse Source 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2022-11-11 17:54:24 +00:00
parent 135af6d9ab
commit 6596a70861
86 changed files with 4957 additions and 4399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/opts/opts_linux.go
View File

@@ -19,23 +19,24 @@ package opts
import (
"context"
"github.com/containerd/cgroups"
cgroupsv2 "github.com/containerd/cgroups/v2"
"github.com/containerd/cgroups/v3"
cgroup1 "github.com/containerd/cgroups/v3/cgroup1"
cgroup2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/namespaces"
)
// WithNamespaceCgroupDeletion removes the cgroup directory that was created for the namespace
func WithNamespaceCgroupDeletion(ctx context.Context, i *namespaces.DeleteInfo) error {
if cgroups.Mode() == cgroups.Unified {
cg, err := cgroupsv2.LoadManager("/sys/fs/cgroup", i.Name)
cg, err := cgroup2.Load(i.Name)
if err != nil {
return err
}
return cg.Delete()
}
cg, err := cgroups.Load(cgroups.V1, cgroups.StaticPath(i.Name))
cg, err := cgroup1.Load(cgroup1.StaticPath(i.Name))
if err != nil {
if err == cgroups.ErrCgroupDeleted {
if err == cgroup1.ErrCgroupDeleted {
return nil
}
return err