diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-23 10:56:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-23 10:56:08 +0100 |
| commit | 1b9a5964dbb25f8c3cf2b530ffba52325cc81678 (patch) | |
| tree | 5924ab4eea975a03b78c3df8b8a3746b4c6a0e66 /pkg/specgen/generate/validate.go | |
| parent | c8d42d93933188b256f57f44660e6041b0d872cd (diff) | |
| parent | a5e49d9668f430d8b7a8b1619fb2bf6c9087fed7 (diff) | |
| download | podman-1b9a5964dbb25f8c3cf2b530ffba52325cc81678.tar.gz podman-1b9a5964dbb25f8c3cf2b530ffba52325cc81678.tar.bz2 podman-1b9a5964dbb25f8c3cf2b530ffba52325cc81678.zip | |
Merge pull request #12599 from rhatdan/kernelmemory
Warn on use of --kernel-memory
Diffstat (limited to 'pkg/specgen/generate/validate.go')
| -rw-r--r-- | pkg/specgen/generate/validate.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkg/specgen/generate/validate.go b/pkg/specgen/generate/validate.go index a44bf9979..c74db7325 100644 --- a/pkg/specgen/generate/validate.go +++ b/pkg/specgen/generate/validate.go @@ -60,10 +60,6 @@ func verifyContainerResourcesCgroupV1(s *specgen.SpecGenerator) ([]string, error if memory.Limit != nil && memory.Reservation != nil && *memory.Limit < *memory.Reservation { return warnings, errors.New("minimum memory limit cannot be less than memory reservation limit, see usage") } - if memory.Kernel != nil && !sysInfo.KernelMemory { - warnings = append(warnings, "Your kernel does not support kernel memory limit capabilities or the cgroup is not mounted. Limitation discarded.") - memory.Kernel = nil - } if memory.DisableOOMKiller != nil && *memory.DisableOOMKiller && !sysInfo.OomKillDisable { warnings = append(warnings, "Your kernel does not support OomKillDisable. OomKillDisable discarded.") memory.DisableOOMKiller = nil |