summaryrefslogtreecommitdiff
path: root/pkg/specgen
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-01-13 14:52:56 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2022-01-14 12:32:35 -0500
commit607cb80bf77642c02b80bff56aa4c3e396a91fa0 (patch)
tree170136eef992647b38b79399f6b1fb3ad98a7b6d /pkg/specgen
parenta15dfb3648b903fa61c299347b315ad8302d8e15 (diff)
downloadpodman-607cb80bf77642c02b80bff56aa4c3e396a91fa0.tar.gz
podman-607cb80bf77642c02b80bff56aa4c3e396a91fa0.tar.bz2
podman-607cb80bf77642c02b80bff56aa4c3e396a91fa0.zip
Fix cgroup mode handling in api server
Also change code to globably be consistent when refering to capatilized Cgroup. Fixed: https://github.com/containers/podman/issues/12550 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen')
-rw-r--r--pkg/specgen/generate/container.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index 2c7b3c091..7b55a0cb3 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -229,6 +229,10 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
}
}
+ if s.CgroupsMode == "" {
+ s.CgroupsMode = rtc.Cgroups()
+ }
+
// If caller did not specify Pids Limits load default
if s.ResourceLimits == nil || s.ResourceLimits.Pids == nil {
if s.CgroupsMode != "disabled" {