containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127 from giuseppe/fix-cgroup-default 

config: default to cgroupns="host" on cgroup v1
This commit is contained in:
Daniel J Walsh 2020-04-23 09:57:05 -04:00 committed by GitHub
parent 2c9d0c5bb2 1f92b8cdcb
commit ea7d7afb90
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/pkg/config/default.go
View File

@ -141,13 +141,18 @@ func DefaultConfig() (*Config, error) {
netns = "slirp4netns" netns = "slirp4netns"
} }
cgroupNS := "host"
if cgroup2, _ := cgroupv2.Enabled(); cgroup2 {
cgroupNS = "private"
}
return &Config{ return &Config{
Containers: ContainersConfig{ Containers: ContainersConfig{
Devices: []string{}, Devices: []string{},
Volumes: []string{}, Volumes: []string{},
Annotations: []string{}, Annotations: []string{},
ApparmorProfile: DefaultApparmorProfile, ApparmorProfile: DefaultApparmorProfile,
CgroupNS: "private", CgroupNS: cgroupNS,
Cgroups: "enabled", Cgroups: "enabled",
DefaultCapabilities: DefaultCapabilities, DefaultCapabilities: DefaultCapabilities,
DefaultSysctls: []string{}, DefaultSysctls: []string{},