Add "podman kube play" cmd

The "podman kube play" command is designed to be a replacement for the
"podman play kube" command.
It performs the same function as "play kube"  while also still working with the same flags and options.
The "podman play kube" command is still functional as an alias of "kube play".

Closes #12475
Signed-off-by: Niall Crowe <nicrowe@redhat.com>
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>

9 files changed, 39 insertions, 49 deletions

diff --git a/docs/play_kube_support.md b/docs/kubernetes_support.md
index 3cfd3fa50..851e692cb 100644
--- a/docs/play_kube_support.md
+++ b/docs/kubernetes_support.md
@@ -1,6 +1,6 @@
-# Podman Play Kube Support
+# Podman Kube Play Support
 
-This document outlines the kube yaml fields that are currently supported by the **podman play kube** command.
+This document outlines the kube yaml fields that are currently supported by the **podman kube play** command.
 
 Note: **N/A** means that the option cannot be supported in a single-node Podman environment.
 
diff --git a/docs/source/Commands.rst b/docs/source/Commands.rst
index 2911efe18..6b26ed1d9 100644
--- a/docs/source/Commands.rst
+++ b/docs/source/Commands.rst
@@ -47,6 +47,8 @@ Commands
 
 :doc:`kill <markdown/podman-kill.1>` Kill one or more running containers with a specific signal
 
+:doc:`kube <markdown/podman-kube.1>` Play a pod
+
 :doc:`load <markdown/podman-load.1>` Load an image from container archive
 
 :doc:`login <markdown/podman-login.1>` Login to a container registry
@@ -65,8 +67,6 @@ Commands
 
 :doc:`pause <markdown/podman-pause.1>` Pause all the processes in one or more containers
 
-:doc:`play <markdown/podman-play.1>` Play a pod
-
 :doc:`pod <markdown/podman-pod.1>` Manage pods
 
 :doc:`port <markdown/podman-port.1>` List port mappings or a specific mapping for the container
diff --git a/docs/source/markdown/links/podman-play-kube.1 b/docs/source/markdown/links/podman-play-kube.1
new file mode 100644
index 000000000..ffa073b9a
--- /dev/null
+++ b/docs/source/markdown/links/podman-play-kube.1
@@ -0,0 +1 @@
+.so man1/podman-kube-play.1
diff --git a/docs/source/markdown/podman-generate-kube.1.md b/docs/source/markdown/podman-generate-kube.1.md
index cbb875f60..9b8aa5b80 100644
--- a/docs/source/markdown/podman-generate-kube.1.md
+++ b/docs/source/markdown/podman-generate-kube.1.md
@@ -213,7 +213,7 @@ status:
 ```
 
 ## SEE ALSO
-**[podman(1)](podman.1.md)**, **[podman-container(1)](podman-container.1.md)**, **[podman-pod(1)](podman-pod.1.md)**, **[podman-play-kube(1)](podman-play-kube.1.md)**
+**[podman(1)](podman.1.md)**, **[podman-container(1)](podman-container.1.md)**, **[podman-pod(1)](podman-pod.1.md)**, **[podman-kube-play(1)](podman-kube-play.1.md)**
 
 ## HISTORY
 December 2018, Originally compiled by Brent Baude (bbaude at redhat dot com)
diff --git a/docs/source/markdown/podman-generate-systemd.1.md b/docs/source/markdown/podman-generate-systemd.1.md
index 56ad4e446..3d63c83c0 100644
--- a/docs/source/markdown/podman-generate-systemd.1.md
+++ b/docs/source/markdown/podman-generate-systemd.1.md
@@ -55,7 +55,7 @@ Use the name of the container for the start, stop, and description in the unit f
 
 Using this flag will yield unit files that do not expect containers and pods to exist.  Instead, new containers and pods are created based on their configuration files.  The unit files are created best effort and may need to be further edited; please review the generated files carefully before using them in production.
 
-Note that `--new` only works on containers and pods created directly via Podman (i.e., `podman [container] {create,run}` or `podman pod create`).  It does not work on containers or pods created via the REST API or via `podman play kube`.
+Note that `--new` only works on containers and pods created directly via Podman (i.e., `podman [container] {create,run}` or `podman pod create`).  It does not work on containers or pods created via the REST API or via `podman kube play`.
 
 #### **--no-header**
 
diff --git a/docs/source/markdown/podman-play-kube.1.md b/docs/source/markdown/podman-kube-play.1.md
index 92cb694b0..37d2069e0 100644
--- a/docs/source/markdown/podman-play-kube.1.md
+++ b/docs/source/markdown/podman-kube-play.1.md
@@ -1,15 +1,15 @@
-% podman-play-kube(1)
+% podman-kube-play(1)
 
 ## NAME
-podman-play-kube - Create containers, pods or volumes based on Kubernetes YAML
+podman-kube-play - Create containers, pods or volumes based on Kubernetes YAML
 
 ## SYNOPSIS
-**podman play kube** [*options*] *file.yml|-*
+**podman kube play** [*options*] *file.yml|-*
 
 ## DESCRIPTION
-**podman play kube** will read in a structured file of Kubernetes YAML.  It will then recreate the containers, pods or volumes described in the YAML.  Containers within a pod are then started and the ID of the new Pod or the name of the new Volume is output. If the yaml file is specified as "-" then `podman play kube` will read the YAML file from stdin.
-Using the `--down` command line option, it is also capable of tearing down the pods created by a previous run of `podman play kube`.
-Using the `--replace` command line option, it will tear down the pods(if any) created by a previous run of `podman play kube` and recreate the pods with the Kubernetes YAML file.
+**podman kube play** will read in a structured file of Kubernetes YAML.  It will then recreate the containers, pods or volumes described in the YAML.  Containers within a pod are then started and the ID of the new Pod or the name of the new Volume is output. If the yaml file is specified as "-" then `podman kube play` will read the YAML file from stdin.
+Using the `--down` command line option, it is also capable of tearing down the pods created by a previous run of `podman kube play`.
+Using the `--replace` command line option, it will tear down the pods(if any) created by a previous run of `podman kube play` and recreate the pods with the Kubernetes YAML file.
 Ideally the input file would be one created by Podman (see podman-generate-kube(1)).  This would guarantee a smooth import and expected results.
 
 Currently, the supported Kubernetes kinds are:
@@ -20,14 +20,16 @@ Currently, the supported Kubernetes kinds are:
 
 `Kubernetes Pods or Deployments`
 
-Only two volume types are supported by play kube, the *hostPath* and *persistentVolumeClaim* volume types. For the *hostPath* volume type, only the  *default (empty)*, *DirectoryOrCreate*, *Directory*, *FileOrCreate*, *File*, *Socket*, *CharDevice* and *BlockDevice* subtypes are supported. Podman interprets the value of *hostPath* *path* as a file path when it contains at least one forward slash, otherwise Podman treats the value as the name of a named volume. When using a *persistentVolumeClaim*, the value for *claimName* is the name for the Podman named volume.
+Only two volume types are supported by kube play, the *hostPath* and *persistentVolumeClaim* volume types. For the *hostPath* volume type, only the  *default (empty)*, *DirectoryOrCreate*, *Directory*, *FileOrCreate*, *File*, *Socket*, *CharDevice* and *BlockDevice* subtypes are supported. Podman interprets the value of *hostPath* *path* as a file path when it contains at least one forward slash, otherwise Podman treats the value as the name of a named volume. When using a *persistentVolumeClaim*, the value for *claimName* is the name for the Podman named volume.
 
 Note: When playing a kube YAML with init containers, the init container will be created with init type value `always`.
 
-Note: *hostPath* volume types created by play kube will be given an SELinux shared label (z), bind mounts are not relabeled (use `chcon -t container_file_t -R <directory>`).
+Note: *hostPath* volume types created by kube play will be given an SELinux shared label (z), bind mounts are not relabeled (use `chcon -t container_file_t -R <directory>`).
 
 Note: If the `:latest` tag is used, Podman will attempt to pull the image from a registry. If the image was built locally with Podman or Buildah, it will have `localhost` as the domain, in that case, Podman will use the image from the local store even if it has the `:latest` tag.
 
+Note: The command `podman play kube` is an alias of `podman kube play`, and will perform the same function.
+
 `Kubernetes PersistentVolumeClaims`
 
 A Kubernetes PersistentVolumeClaim represents a Podman named volume. Only the PersistentVolumeClaim name is required by Podman to create a volume. Kubernetes annotations can be used to make use of the available options for Podman volumes.
@@ -39,7 +41,7 @@ A Kubernetes PersistentVolumeClaim represents a Podman named volume. Only the Pe
 - volume.podman.io/gid
 - volume.podman.io/mount-options
 
-Play kube is capable of building images on the fly given the correct directory layout and Containerfiles. This
+Kube play is capable of building images on the fly given the correct directory layout and Containerfiles. This
 option is not available for remote clients, including Mac and Windows (excluding WSL2) machines, yet. Consider the following excerpt from a YAML file:
 ```
 apiVersion: v1
@@ -57,7 +59,7 @@ spec:
 ```
 
 If there is a directory named `foobar` in the current working directory with a file named `Containerfile` or `Dockerfile`,
-Podman play kube will build that image and name it `foobar`.  An example directory structure for this example would look
+Podman kube play will build that image and name it `foobar`.  An example directory structure for this example would look
 like:
 ```
 |- mykubefiles
@@ -103,19 +105,6 @@ spec:
 
 and as a result environment variable `FOO` will be set to `bar` for container `container-1`.
 
-### Systemd Integration
-
-A Kubernetes YAML can be executed in systemd via the `podman-kube@.service` systemd template.  The template's argument is the path to the YAML file.  Given a `workload.yaml` file in the home directory, it can be executed as follows:
-
-```
-$ escaped=$(systemd-escape ~/sysadmin.yaml)
-$ systemctl --user start podman-kube@$escaped.service
-$ systemctl --user is-active podman-kube@$escaped.service
-active
-```
-
-Note that the path to the YAML file must be escaped via `systemd-escape`.
-
 ## OPTIONS
 
 #### **--annotation**=*key=value*
@@ -158,7 +147,7 @@ value can be entered.  The password is entered without echo.
 
 #### **--down**
 
-Tears down the pods that were created by a previous run of `play kube`.  The pods are stopped and then
+Tears down the pods that were created by a previous run of `kube play`.  The pods are stopped and then
 removed.  Any volumes created are left intact.
 
 #### **--help**, **-h**
@@ -167,7 +156,7 @@ Print usage statement
 
 #### **--ip**=*IP address*
 
-Assign a static ip address to the pod. This option can be specified several times when play kube creates more than one pod.
+Assign a static ip address to the pod. This option can be specified several times when kube play creates more than one pod.
 Note: When joining multiple networks you should use the **--network name:ip=\<ip\>** syntax.
 
 #### **--log-driver**=driver
@@ -193,7 +182,7 @@ This option is currently supported only by the **journald** log driver.
 
 #### **--mac-address**=*MAC address*
 
-Assign a static mac address to the pod. This option can be specified several times when play kube creates more than one pod.
+Assign a static mac address to the pod. This option can be specified several times when kube play creates more than one pod.
 Note: When joining multiple networks you should use the **--network name:mac=\<mac\>** syntax.
 
 #### **--network**=*mode*, **--net**
@@ -240,7 +229,7 @@ Suppress output information when pulling images
 
 #### **--replace**
 
-Tears down the pods created by a previous run of `play kube` and recreates the pods. This option is used to keep the existing pods up to date based upon the Kubernetes YAML.
+Tears down the pods created by a previous run of `kube play` and recreates the pods. This option is used to keep the existing pods up to date based upon the Kubernetes YAML.
 
 #### **--seccomp-profile-root**=*path*
 
@@ -299,19 +288,19 @@ Podman allocates unique ranges of UIDs and GIDs from the `containers` subordinat
 
 Recreate the pod and containers as described in a file called `demo.yml`
 ```
-$ podman play kube demo.yml
+$ podman kube play demo.yml
 52182811df2b1e73f36476003a66ec872101ea59034ac0d4d3a7b40903b955a6
 ```
 
 Recreate the pod and containers as described in a file `demo.yml` sent to stdin
 ```
-$ cat demo.yml | podman play kube -
+$ cat demo.yml | podman kube play -
 52182811df2b1e73f36476003a66ec872101ea59034ac0d4d3a7b40903b955a6
 
 ```
 Teardown the pod and containers as described in a file `demo.yml`
 ```
-$  podman play kube --down demo.yml
+$  podman kube play --down demo.yml
 Pods stopped:
 52182811df2b1e73f36476003a66ec872101ea59034ac0d4d3a7b40903b955a6
 Pods removed:
@@ -320,23 +309,23 @@ Pods removed:
 
 Provide `configmap-foo.yml` and `configmap-bar.yml` as sources for environment variables within the containers.
 ```
-$ podman play kube demo.yml --configmap configmap-foo.yml,configmap-bar.yml
+$ podman kube play demo.yml --configmap configmap-foo.yml,configmap-bar.yml
 52182811df2b1e73f36476003a66ec872101ea59034ac0d4d3a7b40903b955a6
 
-$ podman play kube demo.yml --configmap configmap-foo.yml --configmap configmap-bar.yml
+$ podman kube play demo.yml --configmap configmap-foo.yml --configmap configmap-bar.yml
 52182811df2b1e73f36476003a66ec872101ea59034ac0d4d3a7b40903b955a6
 ```
 
 Create a pod connected to two networks (called net1 and net2) with a static ip
 ```
-$ podman play kube demo.yml --network net1:ip=10.89.1.5 --network net2:ip=10.89.10.10
+$ podman kube play demo.yml --network net1:ip=10.89.1.5 --network net2:ip=10.89.10.10
 52182811df2b1e73f36476003a66ec872101ea59034ac0d4d3a7b40903b955a6
 ```
 
 Please take into account that CNI networks must be created first using podman-network-create(1).
 
 ## SEE ALSO
-**[podman(1)](podman.1.md)**, **[podman-play(1)](podman-play.1.md)**, **[podman-network-create(1)](podman-network-create.1.md)**, **[podman-generate-kube(1)](podman-generate-kube.1.md)**, **[containers-certs.d(5)](https://github.com/containers/image/blob/main/docs/containers-certs.d.5.md)**
+**[podman(1)](podman.1.md)**, **[podman-kube(1)](podman-kube.1.md)**, **[podman-network-create(1)](podman-network-create.1.md)**, **[podman-generate-kube(1)](podman-generate-kube.1.md)**, **[containers-certs.d(5)](https://github.com/containers/image/blob/main/docs/containers-certs.d.5.md)**
 
 ## HISTORY
 December 2018, Originally compiled by Brent Baude (bbaude at redhat dot com)
diff --git a/docs/source/markdown/podman-play.1.md b/docs/source/markdown/podman-kube.1.md
index e5f0d315e..f815ffae2 100644
--- a/docs/source/markdown/podman-play.1.md
+++ b/docs/source/markdown/podman-kube.1.md
@@ -1,20 +1,20 @@
-% podman-play(1)
+% podman-kube(1)
 
 ## NAME
-podman\-play - Play containers, pods or volumes based on a structured input file
+podman\-kube - Play containers, pods or volumes based on a structured input file
 
 ## SYNOPSIS
-**podman play** *subcommand*
+**podman kube** *subcommand*
 
 ## DESCRIPTION
-The play command will recreate containers, pods or volumes based on the input from a structured (like YAML)
+The kube command will recreate containers, pods or volumes based on the input from a structured (like YAML)
 file input.  Containers will be automatically started.
 
 ## COMMANDS
 
 | Command  | Man Page                                            | Description                                                                  |
 | -------  | --------------------------------------------------- | ---------------------------------------------------------------------------- |
-| kube     | [podman-play-kube(1)](podman-play-kube.1.md)        | Create containers, pods or volumes based on Kubernetes YAML.                         |
+| play     | [podman-kube-play(1)](podman-kube-play.1.md)        | Create containers, pods or volumes based on Kubernetes YAML.                         |
 
 ## SEE ALSO
-**[podman(1)](podman.1.md)**, **[podman-pod(1)](podman-pod.1.md)**, **[podman-container(1)](podman-container.1.md)**, **[podman-generate(1)](podman-generate.1.md)**, **[podman-play-kube(1)](podman-play-kube.1.md)**
+**[podman(1)](podman.1.md)**, **[podman-pod(1)](podman-pod.1.md)**, **[podman-container(1)](podman-container.1.md)**, **[podman-generate(1)](podman-generate.1.md)**, **[podman-kube-play(1)](podman-kube-play.1.md)**
diff --git a/docs/source/markdown/podman-pod-create.1.md b/docs/source/markdown/podman-pod-create.1.md
index 53d1e3327..f7bdb623a 100644
--- a/docs/source/markdown/podman-pod-create.1.md
+++ b/docs/source/markdown/podman-pod-create.1.md
@@ -92,7 +92,7 @@ Set the exit policy of the pod when the last container exits.  Supported policie
 | Exit Policy        | Description                                                                 |
 | ------------------ | --------------------------------------------------------------------------- |
 | *continue*         | The pod continues running when the last container exits. Used by default.   |
-| *stop*             | The pod is stopped when the last container exits. Used in `play kube`.      |
+| *stop*             | The pod is stopped when the last container exits. Used in `kube play`.      |
 
 #### **--gidmap**=*container_gid:host_gid:amount*
 
@@ -603,7 +603,7 @@ $ podman pod create --network net1:ip=10.89.1.5 --network net2:ip=10.89.10.10
 ```
 
 ## SEE ALSO
-**[podman(1)](podman.1.md)**, **[podman-pod(1)](podman-pod.1.md)**, **[podman-play-kube(1)](podman-play-kube.1.md)**, **containers.conf(1)**
+**[podman(1)](podman.1.md)**, **[podman-pod(1)](podman-pod.1.md)**, **[podman-kube-play(1)](podman-kube-play.1.md)**, **containers.conf(1)**
 
 
 ## HISTORY
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md
index 3d1578ea1..4c019ae97 100644
--- a/docs/source/markdown/podman.1.md
+++ b/docs/source/markdown/podman.1.md
@@ -325,7 +325,7 @@ the exit codes follow the `chroot` standard, see below:
 | [podman-mount(1)](podman-mount.1.md)             | Mount a working container's root filesystem.                                |
 | [podman-network(1)](podman-network.1.md)         | Manage Podman networks.                                                     |
 | [podman-pause(1)](podman-pause.1.md)             | Pause one or more containers.                                               |
-| [podman-play(1)](podman-play.1.md)               | Play containers, pods or volumes based on a structured input file.          |
+| [podman-kube(1)](podman-kube.1.md)               | Play containers, pods or volumes based on a structured input file.          |
 | [podman-pod(1)](podman-pod.1.md)                 | Management tool for groups of containers, called pods.                      |
 | [podman-port(1)](podman-port.1.md)               | List port mappings for a container.                                         |
 | [podman-ps(1)](podman-ps.1.md)                   | Prints out information about containers.                                    |