diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-06 15:55:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 15:55:15 -0400 |
| commit | e3e2b1e65930bfc40c5b60802c4d6ea175169732 (patch) | |
| tree | de9fbf65281b2d9e69eaa90be2bdee96d3047d5c /cmd/podman/pods/kill.go | |
| parent | b8ad7f241aba622b23b2cfab6fb5284cd26125e3 (diff) | |
| parent | 2fb9bb20df49f665dbc7420a80dc2da57530278f (diff) | |
| download | podman-e3e2b1e65930bfc40c5b60802c4d6ea175169732.tar.gz podman-e3e2b1e65930bfc40c5b60802c4d6ea175169732.tar.bz2 podman-e3e2b1e65930bfc40c5b60802c4d6ea175169732.zip | |
Merge pull request #6871 from mheon/202_backports
Backports for v2.0.2
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 ) |