From 8e3760c29fb46f3be148adf87f9240994bdd1ba4 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 20 Oct 2021 10:54:13 -0400 Subject: Remove --kernel-memory options Kernel memory option has been depracated in runtime-spec, It is believed that it will not work properly on certain kernels. runc ignores it. This PR removes documentation of the flag and also prints a warning if a user uses it. [NO NEW TESTS NEEDED] Helps Fix: https://github.com/containers/podman/issues/12045 Signed-off-by: Daniel J Walsh --- cmd/podman/common/create.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cmd/podman/common/create.go') diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index a3ff37c19..6270bad16 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -319,6 +319,9 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions, "Kernel memory limit "+sizeWithUnitFormat, ) _ = cmd.RegisterFlagCompletionFunc(kernelMemoryFlagName, completion.AutocompleteNone) + // kernel-memory is deprecated in the runtime spec. + _ = createFlags.MarkHidden("kernel-memory") + logDriverFlagName := "log-driver" createFlags.StringVar( &cf.LogDriver, -- cgit v1.2.3-54-g00ecf