diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-06-22 14:29:04 -0700 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-07-06 14:14:53 -0400 |
| commit | 8dd26289bf516dcfbd9aaad6d2dd65c9f84380c8 (patch) | |
| tree | a60eae9ebbd9536d322a707bea2c760f9d94abf3 /cmd/podman/pods/kill.go | |
| parent | de6a8609a81472b5be786c7404576905ebb981fb (diff) | |
| download | podman-8dd26289bf516dcfbd9aaad6d2dd65c9f84380c8.tar.gz podman-8dd26289bf516dcfbd9aaad6d2dd65c9f84380c8.tar.bz2 podman-8dd26289bf516dcfbd9aaad6d2dd65c9f84380c8.zip | |
Fixes --remote flag issues
* --remote, --url and --identity are now anchored to podman command.
Subcommands should no longer have issues
* TraverseChildren now set to V1 expectations
* Latest flag now has helper function. Now has consistent usage.
* IsRemote() uses cobra parser to determin if --remote is given
* Moved validation functions from parser pkg to validate pkg
*
Fixes #6598
Fixes #6704
Signed-off-by: Jhon Honce <jhonce@redhat.com>
<MH: Fixed import issues>
Signed-off-by: Matt Heon <matthew.heon@pm.me>
Diffstat (limited to 'cmd/podman/pods/kill.go')
| -rw-r--r-- | cmd/podman/pods/kill.go | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/cmd/podman/pods/kill.go b/cmd/podman/pods/kill.go index 2076d55e9..2f4930897 100644 --- a/cmd/podman/pods/kill.go +++ b/cmd/podman/pods/kill.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/parse" "github.com/containers/libpod/v2/cmd/podman/registry" "github.com/containers/libpod/v2/cmd/podman/utils" + "github.com/containers/libpod/v2/cmd/podman/validate" "github.com/containers/libpod/v2/pkg/domain/entities" "github.com/spf13/cobra" ) @@ -21,7 +21,7 @@ var ( Long: podKillDescription, RunE: kill, Args: func(cmd *cobra.Command, args []string) error { - return parse.CheckAllLatestAndCIDFile(cmd, args, false, false) + return validate.CheckAllLatestAndCIDFile(cmd, args, false, false) }, Example: `podman pod kill podID podman pod kill --signal TERM mywebserver @@ -41,14 +41,11 @@ func init() { }) flags := killCommand.Flags() flags.BoolVarP(&killOpts.All, "all", "a", false, "Kill all containers in all pods") - flags.BoolVarP(&killOpts.Latest, "latest", "l", false, "Act on the latest pod podman is aware of") flags.StringVarP(&killOpts.Signal, "signal", "s", "KILL", "Signal to send to the containers in the pod") - if registry.IsRemote() { - _ = flags.MarkHidden("latest") - } - + validate.AddLatestFlag(killCommand, &killOpts.Latest) } -func kill(cmd *cobra.Command, args []string) error { + +func kill(_ *cobra.Command, args []string) error { var ( errs utils.OutputErrors ) |