[Techinal Debt] Cleanup ABI vs. Tunnel CLI commands

[NO TESTS NEEDED]

This commit cleans up two issues:
* Most commands support all EngineModes so default to that. Let
  outlayers declare their intent.
* Use cobra.Annotations to set supported EngineMode. This simplies
  instantiating commands as there is now one method to communicate a
  commands requirements rather than two.
* Combined aliased commands into one file
* Fixed aliased commands where Args field did not match
* Updated examples in README.md for writing commands
* Remove redundant flag DisableFlagsInUseLine in cobra.Command
  initialization.

Signed-off-by: Jhon Honce <jhonce@redhat.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go
index 91c49333a..83a873c2a 100644
--- a/cmd/podman/system/renumber.go
+++ b/cmd/podman/system/renumber.go
@@ -23,19 +23,18 @@ var (
 `
 
 	renumberCommand = &cobra.Command{
-		Use:                   "renumber",
-		Args:                  validate.NoArgs,
-		DisableFlagsInUseLine: true,
-		Short:                 "Migrate lock numbers",
-		Long:                  renumberDescription,
-		Run:                   renumber,
-		ValidArgsFunction:     completion.AutocompleteNone,
+		Annotations:       map[string]string{registry.EngineMode: registry.ABIMode},
+		Use:               "renumber",
+		Args:              validate.NoArgs,
+		Short:             "Migrate lock numbers",
+		Long:              renumberDescription,
+		Run:               renumber,
+		ValidArgsFunction: completion.AutocompleteNone,
 	}
 )
 
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode},
 		Command: renumberCommand,
 		Parent:  systemCmd,
 	})