diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-22 00:26:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 00:26:39 +0000 |
| commit | 9e453e242e39da44badbbef985fa03b16dfd87e9 (patch) | |
| tree | 9d3c6dbca0b355f6609c5068e2dcb68e9feb11f5 /cmd | |
| parent | c09fab59ddc6964e1c6afc31fa5f1b04c57a2b8c (diff) | |
| parent | 8e3760c29fb46f3be148adf87f9240994bdd1ba4 (diff) | |
| download | podman-9e453e242e39da44badbbef985fa03b16dfd87e9.tar.gz podman-9e453e242e39da44badbbef985fa03b16dfd87e9.tar.bz2 podman-9e453e242e39da44badbbef985fa03b16dfd87e9.zip | |
Merge pull request #12048 from rhatdan/man
Remove --kernel-memory options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common/create.go | 3 | ||||
| -rw-r--r-- | cmd/podman/common/create_opts.go | 4 |
2 files changed, 7 insertions, 0 deletions
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, diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 50d7c446d..223a91331 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -18,6 +18,7 @@ import ( "github.com/containers/podman/v3/pkg/specgen" "github.com/docker/docker/api/types/mount" "github.com/pkg/errors" + "github.com/sirupsen/logrus" ) func stringMaptoArray(m map[string]string) []string { @@ -383,6 +384,9 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, rtc *c if cc.HostConfig.Memory > 0 { cliOpts.Memory = strconv.Itoa(int(cc.HostConfig.Memory)) } + if cc.HostConfig.KernelMemory > 0 { + logrus.Warnf("The --kernel-memory flag has been deprecated. May not work properly on your system.") + } if cc.HostConfig.MemoryReservation > 0 { cliOpts.MemoryReservation = strconv.Itoa(int(cc.HostConfig.MemoryReservation)) |