Merge pull request #43004 from AkihiroSuda/cherrypick-42152
[20.10 backport] info: unset cgroup-related fields when CgroupDriver == none
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()
