Skip to content

Commit 95f06b4

Browse files
committed
Add support for cgroupv2 container manager
Signed-off-by: Derek Nola <derek.nola@suse.com>
1 parent f57ecd6 commit 95f06b4

14 files changed

Lines changed: 1570 additions & 1 deletion

File tree

containermanager/container_manager_linux.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ import (
2828

2929
"github.com/opencontainers/runc/libcontainer/cgroups"
3030
cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
31+
cgroupfs2 "github.com/opencontainers/runc/libcontainer/cgroups/fs2"
3132
"github.com/opencontainers/runc/libcontainer/configs"
3233
"github.com/opencontainers/runc/libcontainer/devices"
34+
"github.com/pkg/errors"
3335
"github.com/sirupsen/logrus"
3436
utilversion "k8s.io/apimachinery/pkg/util/version"
3537
"k8s.io/apimachinery/pkg/util/wait"
@@ -77,7 +79,7 @@ func (m *containerManager) Start() error {
7779
if len(m.cgroupsName) != 0 {
7880
manager, err := createCgroupManager(m.cgroupsName)
7981
if err != nil {
80-
return err
82+
return errors.Wrapf(err, "failed to create cgroup manager %s", m.cgroupsName)
8183
}
8284
m.cgroupsManager = manager
8385
}
@@ -137,6 +139,9 @@ func createCgroupManager(name string) (cgroups.Manager, error) {
137139
},
138140
},
139141
}
142+
if cgroups.IsCgroup2UnifiedMode() {
143+
return cgroupfs2.NewManager(cg, "")
144+
}
140145
return cgroupfs.NewManager(cg, nil)
141146
}
142147

vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs2/cpu.go

Lines changed: 118 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs2/cpuset.go

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs2/create.go

Lines changed: 152 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)