only create crgoup when not rootless if using cgroupfs
[NO NEW TESTS NEEDED] now that podman's cgroup config tries to initialize controllers, cgroupfs errors out on pod creation we need to mimic the behavior that used to exist and only create the cgroup when running as rootful Signed-off-by: Charlie Doern <cdoern@redhat.com>
This commit is contained in:
parent
653e87dd4c
commit
7f994a80de
|
|
@ -78,6 +78,8 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option
|
|||
pod.state.CgroupPath = filepath.Join(pod.config.CgroupParent, pod.ID())
|
||||
if p.InfraContainerSpec != nil {
|
||||
p.InfraContainerSpec.CgroupParent = pod.state.CgroupPath
|
||||
// cgroupfs + rootless = permission denied when creating the cgroup.
|
||||
if !rootless.IsRootless() {
|
||||
res, err := GetLimits(p.InfraContainerSpec.ResourceLimits)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -97,6 +99,7 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
case config.SystemdCgroupsManager:
|
||||
if pod.config.CgroupParent == "" {
|
||||
if rootless.IsRootless() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue