refactoring for easy unit-test and cm-cli integration

CONTRIBUTING.md

@@ -36,16 +36,10 @@ Anyone can comment on issues and submit reviews for pull requests. In order to b
 - The project tries to follow the following grammar for the commands:
 
 ```bash
-clusteradm <verb> [<noun>]
+clusteradm <cmd> [subcmd] [flags]
 ```
 
-- A number of verbs are already defined in [verbs](pkg/cmd/verbs/verbs.go), if you would like to add a new verb or noun, please contact the [OWNERS](OWNERS).
-
-- The noun represents the object on which the verb applies.
-
-- Each pair (verb/[noum]) has its own package.
-
-- Inside the package, the code is split in 3 files: The [cmd.go](pkg/cmd/version/cmd.go) which creates the cobra command, the [options.go](pkg/cmd/version/options.go) which defines the different option parameters for the command and the the [exec.go](pkg/cmd/version/exec.go) which contains the code to execute the command.
+- Each cmd/subcmd are in a package, the code is split in 3 files: The [cmd.go](pkg/cmd/version/cmd.go) which creates the cobra command, the [options.go](pkg/cmd/version/options.go) which defines the different option parameters for the command and the the [exec.go](pkg/cmd/version/exec.go) which contains the code to execute the command.
 
 
 ## Resources

VERSION.txt

@@ -1 +1 @@
-0.0.1
+0.0.2

cmd/clusteradm.go

@@ -13,7 +13,12 @@ import (
 	"k8s.io/kubectl/pkg/cmd/options"
 	"k8s.io/kubectl/pkg/cmd/plugin"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
-	"open-cluster-management.io/clusteradm/pkg/cmd/verbs"
+	ktemplates "k8s.io/kubectl/pkg/util/templates"
+	"open-cluster-management.io/clusteradm/pkg/cmd/version"
+
+	acceptclusters "open-cluster-management.io/clusteradm/pkg/cmd/accept"
+	inithub "open-cluster-management.io/clusteradm/pkg/cmd/init"
+	joinhub "open-cluster-management.io/clusteradm/pkg/cmd/join"
 )
 
 func main() {
@@ -22,7 +27,10 @@ func main() {
 	matchVersionKubeConfigFlags := cmdutil.NewMatchVersionFlags(configFlags)
 	f := cmdutil.NewFactory(matchVersionKubeConfigFlags)
 
-	root := newCmdVerbs("clusteradm", f, streams)
+	root :=
+		&cobra.Command{
+			Use: "clusteradm",
+		}
 
 	flags := root.PersistentFlags()
 	matchVersionKubeConfigFlags.AddFlags(flags)
@@ -39,20 +47,24 @@ func main() {
 	plugin.ValidPluginFilenamePrefixes = []string{os.Args[0]}
 	root.AddCommand(plugin.NewCmdPlugin(f, streams))
 
+	groups := ktemplates.CommandGroups{
+		{
+			Message: "General commands:",
+			Commands: []*cobra.Command{
+				version.NewCmd(f, streams),
+			},
+		},
+		{
+			Message: "Registration commands:",
+			Commands: []*cobra.Command{
+				inithub.NewCmd(f, streams),
+				joinhub.NewCmd(f, streams),
+				acceptclusters.NewCmd(f, streams),
+			},
+		},
+	}
+	groups.Add(root)
 	if err := root.Execute(); err != nil {
 		os.Exit(1)
 	}
 }
-
-// NewCmdNamespace provides a cobra command wrapping NamespaceOptions
-func newCmdVerbs(parent string, f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
-	cmd := &cobra.Command{Use: parent}
-	cmd.AddCommand(
-		verbs.NewVerbVersion("version", f, streams),
-		verbs.NewVerbInit("init", f, streams),
-		verbs.NewVerbJoin("join", f, streams),
-		verbs.NewVerbAccept("accept", f, streams),
-	)
-
-	return cmd
-}

pkg/cmd/accept/cmd.go

@@ -16,10 +16,6 @@ var example = `
 %[1]s accept --clusters <cluster_1>,<cluster_2>,...
 `
 
-const (
-	scenarioDirectory = "accept"
-)
-
 // NewCmd ...
 func NewCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
 	o := newOptions(f, streams)

pkg/cmd/init/cmd.go

@@ -16,10 +16,6 @@ var example = `
 %[1]s init
 `
 
-const (
-	scenarioDirectory = "init"
-)
-
 // NewCmd ...
 func NewCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
 	o := newOptions(f, streams)

pkg/cmd/init/exec.go

@@ -3,15 +3,18 @@ package init
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
 	"open-cluster-management.io/clusteradm/pkg/cmd/init/scenario"
 	"open-cluster-management.io/clusteradm/pkg/helpers"
+	"open-cluster-management.io/clusteradm/pkg/helpers/apply"
 
 	"github.com/spf13/cobra"
 
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/client-go/discovery"
+	"k8s.io/client-go/util/retry"
 )
 
 func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
@@ -45,8 +48,13 @@ func (o *Options) run() error {
 		return err
 	}
 
+	apiExtensionsClient, err := apiextensionsclient.NewForConfig(restConfig)
+	if err != nil {
+		return err
+	}
+
 	clientHolder := resourceapply.NewClientHolder().
-		WithAPIExtensionsClient(apiextensionsclient.NewForConfigOrDie(restConfig)).
+		WithAPIExtensionsClient(apiExtensionsClient).
 		WithKubernetes(kubeClient).
 		WithDynamicClient(dynamicClient)
 
@@ -61,17 +69,25 @@ func (o *Options) run() error {
 		"init/service_account.yaml",
 	}
 
-	err = helpers.ApplyDirectly(clientHolder, reader, scenarioDirectory, o.values, files...)
+	err = apply.ApplyDirectly(clientHolder, reader, o.values, "", files...)
 	if err != nil {
 		return err
 	}
 
-	err = helpers.ApplyDeployment(kubeClient, reader, scenarioDirectory, o.values, "init/operator.yaml")
+	err = apply.ApplyDeployment(kubeClient, reader, o.values, "", "init/operator.yaml")
 	if err != nil {
 		return err
 	}
+
+	b := retry.DefaultBackoff
+	b.Duration = 100 * time.Millisecond
+	err = helpers.WaitCRDToBeReady(*apiExtensionsClient, "clustermanagers.operator.open-cluster-management.io", b)
+	if err != nil {
+		return err
+	}
+
 	discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(restConfig)
-	err = helpers.ApplyCustomResouces(dynamicClient, discoveryClient, reader, scenarioDirectory, o.values, "init/clustermanagers.cr.yaml")
+	err = apply.ApplyCustomResouces(dynamicClient, discoveryClient, reader, o.values, "", "init/clustermanagers.cr.yaml")
 	if err != nil {
 		return err
 	}

pkg/cmd/init/scenario/resources.go

@@ -4,12 +4,12 @@ package scenario
 import (
 	"embed"
 
-	"open-cluster-management.io/clusteradm/pkg/helpers"
+	"open-cluster-management.io/clusteradm/pkg/helpers/asset"
 )
 
 //go:embed init
 var files embed.FS
 
-func GetScenarioResourcesReader() *helpers.ScenarioResourcesReader {
-	return helpers.NewScenarioResourcesReader(&files)
+func GetScenarioResourcesReader() *asset.ScenarioResourcesReader {
+	return asset.NewScenarioResourcesReader(&files)
 }

pkg/cmd/join/cmd.go

@@ -16,10 +16,6 @@ var example = `
 %[1]s join --hub-token <tokenID.tokenSecret> --hub-apiserver <hub_apiserveR_url> --name <cluster_name>
 `
 
-const (
-	scenarioDirectory = "join"
-)
-
 // NewCmd ...
 func NewCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
 	o := newOptions(f, streams)

pkg/cmd/join/exec.go

@@ -3,17 +3,22 @@ package join
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/ghodss/yaml"
 	"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/apimachinery/pkg/api/errors"
+
+	// "k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapiv1 "k8s.io/client-go/tools/clientcmd/api/v1"
+	"k8s.io/client-go/util/retry"
 	"open-cluster-management.io/clusteradm/pkg/cmd/join/scenario"
 	"open-cluster-management.io/clusteradm/pkg/helpers"
+	"open-cluster-management.io/clusteradm/pkg/helpers/apply"
 
 	"github.com/spf13/cobra"
 )
@@ -75,8 +80,13 @@ func (o *Options) run() error {
 		return err
 	}
 
+	apiExtensionsClient, err := apiextensionsclient.NewForConfig(restConfig)
+	if err != nil {
+		return err
+	}
+
 	clientHolder := resourceapply.NewClientHolder().
-		WithAPIExtensionsClient(apiextensionsclient.NewForConfigOrDie(restConfig)).
+		WithAPIExtensionsClient(apiExtensionsClient).
 		WithKubernetes(kubeClient).
 		WithDynamicClient(dynamicClient)
 
@@ -90,18 +100,26 @@ func (o *Options) run() error {
 		"join/service_account.yaml",
 	}
 
-	err = helpers.ApplyDirectly(clientHolder, reader, scenarioDirectory, o.values, files...)
+	err = apply.ApplyDirectly(clientHolder, reader, o.values, "", files...)
 	if err != nil {
 		return err
 	}
 
-	err = helpers.ApplyDeployment(kubeClient, reader, scenarioDirectory, o.values, "join/operator.yaml")
+	err = apply.ApplyDeployment(kubeClient, reader, o.values, "", "join/operator.yaml")
+	if err != nil {
+		return err
+	}
+
+	b := retry.DefaultBackoff
+	b.Duration = 100 * time.Millisecond
+
+	err = helpers.WaitCRDToBeReady(*apiExtensionsClient, "klusterlets.operator.open-cluster-management.io", b)
 	if err != nil {
 		return err
 	}
 
 	discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(restConfig)
-	err = helpers.ApplyCustomResouces(dynamicClient, discoveryClient, reader, scenarioDirectory, o.values, "join/klusterlets.cr.yaml")
+	err = apply.ApplyCustomResouces(dynamicClient, discoveryClient, reader, o.values, "", "join/klusterlets.cr.yaml")
 	if err != nil {
 		return err
 	}

pkg/cmd/join/scenario/resources.go

@@ -4,12 +4,12 @@ package scenario
 import (
 	"embed"
 
-	"open-cluster-management.io/clusteradm/pkg/helpers"
+	"open-cluster-management.io/clusteradm/pkg/helpers/asset"
 )
 
 //go:embed join
 var files embed.FS
 
-func GetScenarioResourcesReader() *helpers.ScenarioResourcesReader {
-	return helpers.NewScenarioResourcesReader(&files)
+func GetScenarioResourcesReader() *asset.ScenarioResourcesReader {
+	return asset.NewScenarioResourcesReader(&files)
 }