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/specgenutil | |
| 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/specgenutil')
| -rw-r--r-- | pkg/specgenutil/specgen.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index 9a91b2893..be8f277cc 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -163,14 +163,6 @@ func getMemoryLimits(s *specgen.SpecGenerator, c *entities.ContainerCreateOption hasLimits = true } } - if m := c.KernelMemory; len(m) > 0 { - mk, err := units.RAMInBytes(m) - if err != nil { - return nil, errors.Wrapf(err, "invalid value for kernel-memory") - } - memory.Kernel = &mk - hasLimits = true - } if c.MemorySwappiness >= 0 { swappiness := uint64(c.MemorySwappiness) memory.Swappiness = &swappiness |