info: unset cgroup-related fields when CgroupDriver == none Fix issue 42151 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 039e9670cb6ec2f24fcce9c3ddbbfa0e75a70138) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
diff --git a/daemon/info_unix.go b/daemon/info_unix.go index 73d5663..704bd26 100644 --- a/daemon/info_unix.go +++ b/daemon/info_unix.go
@@ -25,16 +25,18 @@ v.CgroupVersion = "2" } - v.MemoryLimit = sysInfo.MemoryLimit - v.SwapLimit = sysInfo.SwapLimit - v.KernelMemory = sysInfo.KernelMemory - v.KernelMemoryTCP = sysInfo.KernelMemoryTCP - v.OomKillDisable = sysInfo.OomKillDisable - v.CPUCfsPeriod = sysInfo.CPUCfs - v.CPUCfsQuota = sysInfo.CPUCfs - v.CPUShares = sysInfo.CPUShares - v.CPUSet = sysInfo.Cpuset - v.PidsLimit = sysInfo.PidsLimit + if v.CgroupDriver != cgroupNoneDriver { + v.MemoryLimit = sysInfo.MemoryLimit + v.SwapLimit = sysInfo.SwapLimit + v.KernelMemory = sysInfo.KernelMemory + v.KernelMemoryTCP = sysInfo.KernelMemoryTCP + v.OomKillDisable = sysInfo.OomKillDisable + v.CPUCfsPeriod = sysInfo.CPUCfs + v.CPUCfsQuota = sysInfo.CPUCfs + v.CPUShares = sysInfo.CPUShares + v.CPUSet = sysInfo.Cpuset + v.PidsLimit = sysInfo.PidsLimit + } v.Runtimes = daemon.configStore.GetAllRuntimes() v.DefaultRuntime = daemon.configStore.GetDefaultRuntimeName() v.InitBinary = daemon.configStore.GetInitPath()