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

8
pkg/oom/v1/v1.go
View File

@@ -24,7 +24,7 @@ import (
"fmt"
"sync"
"github.com/containerd/cgroups"
"github.com/containerd/cgroups/v3/cgroup1"
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/pkg/oom"
"github.com/containerd/containerd/runtime"
@@ -58,7 +58,7 @@ type epoller struct {
type item struct {
id string
cg cgroups.Cgroup
cg cgroup1.Cgroup
}
// Close the epoll fd
@@ -91,7 +91,7 @@ func (e *epoller) Run(ctx context.Context) {
// Add cgroups.Cgroup to the epoll monitor
func (e *epoller) Add(id string, cgx interface{}) error {
cg, ok := cgx.(cgroups.Cgroup)
cg, ok := cgx.(cgroup1.Cgroup)
if !ok {
return fmt.Errorf("expected cgroups.Cgroup, got: %T", cgx)
}
@@ -121,7 +121,7 @@ func (e *epoller) process(ctx context.Context, fd uintptr) {
return
}
e.mu.Unlock()
if i.cg.State() == cgroups.Deleted {
if i.cg.State() == cgroup1.Deleted {
e.mu.Lock()
delete(e.set, fd)
e.mu.Unlock()

2
pkg/oom/v2/v2.go
View File

@@ -23,7 +23,7 @@ import (
"context"
"fmt"
cgroupsv2 "github.com/containerd/cgroups/v2"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/pkg/oom"
"github.com/containerd/containerd/runtime"