diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-03 20:13:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-03 20:13:51 +0000 |
| commit | 73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6 (patch) | |
| tree | 5db98fc07babcc3b1a1f5bb71252edf6b939096f /cmd | |
| parent | fd33ab09365994ba4625f238c88474a4167ede66 (diff) | |
| parent | b92149e2a8ce596b2839ec404e2ebd457943848f (diff) | |
| download | podman-73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6.tar.gz podman-73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6.tar.bz2 podman-73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6.zip | |
Merge pull request #14802 from cdoern/podMemory
podman pod create --memory
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common/create.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index e25bdd241..f05549a8d 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -863,14 +863,6 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions, ) _ = cmd.RegisterFlagCompletionFunc(cpusetMemsFlagName, completion.AutocompleteNone) - memoryFlagName := "memory" - createFlags.StringVarP( - &cf.Memory, - memoryFlagName, "m", "", - "Memory limit "+sizeWithUnitFormat, - ) - _ = cmd.RegisterFlagCompletionFunc(memoryFlagName, completion.AutocompleteNone) - memoryReservationFlagName := "memory-reservation" createFlags.StringVar( &cf.MemoryReservation, @@ -912,4 +904,12 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions, "CPUs in which to allow execution (0-3, 0,1)", ) _ = cmd.RegisterFlagCompletionFunc(cpusetCpusFlagName, completion.AutocompleteNone) + + memoryFlagName := "memory" + createFlags.StringVarP( + &cf.Memory, + memoryFlagName, "m", "", + "Memory limit "+sizeWithUnitFormat, + ) + _ = cmd.RegisterFlagCompletionFunc(memoryFlagName, completion.AutocompleteNone) } |