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 /libpod | |
| 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 'libpod')
| -rw-r--r-- | libpod/container_inspect.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index b065dd1f9..f72700ab6 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -493,9 +493,6 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named if ctrSpec.Linux.Resources.Memory.Limit != nil { hostConfig.Memory = *ctrSpec.Linux.Resources.Memory.Limit } - if ctrSpec.Linux.Resources.Memory.Kernel != nil { - hostConfig.KernelMemory = *ctrSpec.Linux.Resources.Memory.Kernel - } if ctrSpec.Linux.Resources.Memory.Reservation != nil { hostConfig.MemoryReservation = *ctrSpec.Linux.Resources.Memory.Reservation } |