cmd/operator-sdk: move olm out of alpha (#2447)

* cmd/operator-sdk: move 'olm install/uninstall/status' out of 'alpha'
* doc/cli: regenerate
* CHANGELOG.md: add 'alpha olm' change
* hack/tests: remove 'alpha' subcommand from 'olm' invocations

Author: Eric Stroczynski

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Moved `olm-catalog gen-csv` to the `generate csv` subcommand. ([#2439](https://github.com/operator-framework/operator-sdk/pull/2439))
 - `run ansible/helm` are now the hidden commands `exec-entrypoint ansible/helm`. All functionality of each subcommand is the same. ([#2441](https://github.com/operator-framework/operator-sdk/pull/2441))
 - `up local` is now [`run --local`](./doc/cli/operator-sdk_run.md). All functionality of this command is the same. ([#2441](https://github.com/operator-framework/operator-sdk/pull/2441))
+- **Breaking Change:** Moved the `olm` subcommand from `alpha` to its own subcommand. All functionality of this command is the same. ([#2447](https://github.com/operator-framework/operator-sdk/pull/2447))
 
 ### Deprecated
 

cmd/operator-sdk/alpha/cmd.go

@@ -16,7 +16,6 @@ package alpha
 
 import (
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/alpha/kubebuilder"
-	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/alpha/olm"
 
 	"github.com/spf13/cobra"
 )
@@ -29,7 +28,6 @@ func NewCmd() *cobra.Command {
 
 	cmd.AddCommand(
 		kubebuilder.NewCmd(),
-		olm.NewCmd(),
 	)
 	return cmd
 }

cmd/operator-sdk/cli/cli.go

@@ -30,6 +30,7 @@ import (
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/migrate"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/new"
+	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/olm"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/printdeps"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/run"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/scorecard"
@@ -62,21 +63,24 @@ func GetCLIRoot() *cobra.Command {
 		},
 	}
 
-	root.AddCommand(add.NewCmd())
-	root.AddCommand(alpha.NewCmd())
-	root.AddCommand(build.NewCmd())
-	root.AddCommand(bundle.NewCmd())
-	root.AddCommand(cleanup.NewCmd())
-	root.AddCommand(completion.NewCmd())
-	root.AddCommand(execentrypoint.NewCmd())
-	root.AddCommand(generate.NewCmd())
-	root.AddCommand(migrate.NewCmd())
-	root.AddCommand(new.NewCmd())
-	root.AddCommand(printdeps.NewCmd())
-	root.AddCommand(run.NewCmd())
-	root.AddCommand(scorecard.NewCmd())
-	root.AddCommand(test.NewCmd())
-	root.AddCommand(version.NewCmd())
+	root.AddCommand(
+		add.NewCmd(),
+		alpha.NewCmd(),
+		build.NewCmd(),
+		bundle.NewCmd(),
+		cleanup.NewCmd(),
+		completion.NewCmd(),
+		execentrypoint.NewCmd(),
+		generate.NewCmd(),
+		migrate.NewCmd(),
+		new.NewCmd(),
+		olm.NewCmd(),
+		printdeps.NewCmd(),
+		run.NewCmd(),
+		scorecard.NewCmd(),
+		test.NewCmd(),
+		version.NewCmd(),
+	)
 
 	return root
 }

cmd/operator-sdk/alpha/olm/cmd.go renamed to cmd/operator-sdk/olm/cmd.go

@@ -24,9 +24,9 @@ func NewCmd() *cobra.Command {
 		Short: "Manage the Operator Lifecycle Manager installation in your cluster",
 	}
 	cmd.AddCommand(
-		NewInstallCmd(),
-		NewUninstallCmd(),
-		NewStatusCmd(),
+		newInstallCmd(),
+		newUninstallCmd(),
+		newStatusCmd(),
 	)
 	return cmd
 }

cmd/operator-sdk/alpha/olm/install.go renamed to cmd/operator-sdk/olm/install.go

@@ -21,7 +21,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func NewInstallCmd() *cobra.Command {
+func newInstallCmd() *cobra.Command {
 	mgr := &olm.Manager{}
 	cmd := &cobra.Command{
 		Use:   "install",

cmd/operator-sdk/alpha/olm/status.go renamed to cmd/operator-sdk/olm/status.go

@@ -21,7 +21,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func NewStatusCmd() *cobra.Command {
+func newStatusCmd() *cobra.Command {
 	mgr := olm.Manager{}
 	cmd := &cobra.Command{
 		Use:   "status",

cmd/operator-sdk/alpha/olm/uninstall.go renamed to cmd/operator-sdk/olm/uninstall.go

@@ -21,7 +21,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func NewUninstallCmd() *cobra.Command {
+func newUninstallCmd() *cobra.Command {
 	mgr := olm.Manager{}
 	cmd := &cobra.Command{
 		Use:   "uninstall",

doc/cli/operator-sdk.md

@@ -15,14 +15,14 @@ An SDK for building operators with ease
 ### SEE ALSO
 
 * [operator-sdk add](operator-sdk_add.md)	 - Adds a controller or resource to the project
-* [operator-sdk alpha](operator-sdk_alpha.md)	 - Run an alpha subcommand
 * [operator-sdk build](operator-sdk_build.md)	 - Compiles code and builds artifacts
 * [operator-sdk bundle](operator-sdk_bundle.md)	 - Work with operator bundle metadata and bundle images
 * [operator-sdk cleanup](operator-sdk_cleanup.md)	 - Delete and clean up after a running Operator
 * [operator-sdk completion](operator-sdk_completion.md)	 - Generators for shell completions
 * [operator-sdk generate](operator-sdk_generate.md)	 - Invokes a specific generator
 * [operator-sdk migrate](operator-sdk_migrate.md)	 - Adds source code to an operator
 * [operator-sdk new](operator-sdk_new.md)	 - Creates a new operator application
+* [operator-sdk olm](operator-sdk_olm.md)	 - Manage the Operator Lifecycle Manager installation in your cluster
 * [operator-sdk print-deps](operator-sdk_print-deps.md)	 - Print Golang packages and versions required to run the operator
 * [operator-sdk run](operator-sdk_run.md)	 - Run an Operator in a variety of environments
 * [operator-sdk scorecard](operator-sdk_scorecard.md)	 - Run scorecard tests