summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorAkihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>2023-01-30 23:43:31 +0900
committerAkihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>2023-03-08 20:15:17 +0900
commite807ae4f2e15583ee886cbb1b5274119809b25fd (patch)
tree51aa28263d62d420a8ad08d2de6cf80e8723b5f4 /pkg
parente528b227a63e69c5a0d66703d20fcb2521cd0452 (diff)
downloaddocker-e807ae4f2e15583ee886cbb1b5274119809b25fd.tar.gz
vendor: github.com/containerd/cgroups/v3 v3.0.1
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/sysinfo/cgroup2_linux.go6
-rw-r--r--pkg/sysinfo/sysinfo_linux.go5
2 files changed, 6 insertions, 5 deletions
diff --git a/pkg/sysinfo/cgroup2_linux.go b/pkg/sysinfo/cgroup2_linux.go
index fa6338e19b..151179ca32 100644
--- a/pkg/sysinfo/cgroup2_linux.go
+++ b/pkg/sysinfo/cgroup2_linux.go
@@ -5,8 +5,8 @@ import (
"path"
"strings"
- "github.com/containerd/cgroups"
- cgroupsV2 "github.com/containerd/cgroups/v2"
+ "github.com/containerd/cgroups/v3"
+ cgroupsV2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/pkg/userns"
"github.com/sirupsen/logrus"
)
@@ -27,7 +27,7 @@ func newV2(options ...Opt) *SysInfo {
applyCgroupNsInfo,
}
- m, err := cgroupsV2.LoadManager("/sys/fs/cgroup", sysInfo.cg2GroupPath)
+ m, err := cgroupsV2.Load(sysInfo.cg2GroupPath)
if err != nil {
logrus.Warn(err)
} else {
diff --git a/pkg/sysinfo/sysinfo_linux.go b/pkg/sysinfo/sysinfo_linux.go
index 910ce2d442..215d7ff302 100644
--- a/pkg/sysinfo/sysinfo_linux.go
+++ b/pkg/sysinfo/sysinfo_linux.go
@@ -7,7 +7,8 @@ import (
"strings"
"sync"
- "github.com/containerd/cgroups"
+ "github.com/containerd/cgroups/v3"
+ "github.com/containerd/cgroups/v3/cgroup1"
"github.com/containerd/containerd/pkg/seccomp"
"github.com/moby/sys/mountinfo"
"github.com/sirupsen/logrus"
@@ -40,7 +41,7 @@ func findCgroupV1Mountpoints() (map[string]string, error) {
return nil, err
}
- allSubsystems, err := cgroups.ParseCgroupFile("/proc/self/cgroup")
+ allSubsystems, err := cgroup1.ParseCgroupFile("/proc/self/cgroup")
if err != nil {
return nil, fmt.Errorf("Failed to parse cgroup information: %v", err)
}