diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-21 23:01:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-21 23:01:03 +0200 |
| commit | ee937c518e7efb9c47d21a4e1050b966ca02d005 (patch) | |
| tree | 2cd2dfd0bcd1332a187f9cb66eff51a9591c4069 /libpod/runtime_pod_linux.go | |
| parent | 34b2018cfc75772e89367614852c382ac47d3ec1 (diff) | |
| parent | c00ea686fef5a382849307d393226971fb1da1f3 (diff) | |
| download | podman-ee937c518e7efb9c47d21a4e1050b966ca02d005.tar.gz podman-ee937c518e7efb9c47d21a4e1050b966ca02d005.tar.bz2 podman-ee937c518e7efb9c47d21a4e1050b966ca02d005.zip | |
Merge pull request #14876 from cdoern/cgroup
resource limits for pods
Diffstat (limited to 'libpod/runtime_pod_linux.go')
| -rw-r--r-- | libpod/runtime_pod_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index 75ff24e41..3bb22ec26 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -80,7 +80,7 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option p.InfraContainerSpec.CgroupParent = pod.state.CgroupPath // cgroupfs + rootless = permission denied when creating the cgroup. if !rootless.IsRootless() { - res, err := GetLimits(p.InfraContainerSpec.ResourceLimits) + res, err := GetLimits(p.ResourceLimits) if err != nil { return nil, err } @@ -113,7 +113,7 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option // If we are set to use pod cgroups, set the cgroup parent that // all containers in the pod will share if pod.config.UsePodCgroup { - cgroupPath, err := systemdSliceFromPath(pod.config.CgroupParent, fmt.Sprintf("libpod_pod_%s", pod.ID()), p.InfraContainerSpec.ResourceLimits) + cgroupPath, err := systemdSliceFromPath(pod.config.CgroupParent, fmt.Sprintf("libpod_pod_%s", pod.ID()), p.ResourceLimits) if err != nil { return nil, fmt.Errorf("unable to create pod cgroup for pod %s: %w", pod.ID(), err) } |