Standardize location of AddCommand(...) call

clusterctl/cmd/create.go

@@ -27,5 +27,5 @@ var createCmd = &cobra.Command{
 }
 
 func init() {
-	createCmd.AddCommand(createClusterCmd)
+	RootCmd.AddCommand(createCmd)
 }

clusterctl/cmd/create_cluster.go

@@ -77,6 +77,7 @@ func init() {
 	// Optional flags
 	createClusterCmd.Flags().BoolVarP(&co.CleanupExternalCluster, "cleanup-external-cluster", "", true, "Whether to cleanup the external cluster after bootstrap")
 	createClusterCmd.Flags().StringVarP(&co.VmDriver, "vm-driver", "", "", "Which vm driver to use for minikube")
+	createCmd.AddCommand(createClusterCmd)
 }
 
 func parseClusterYaml(file string) (*clusterv1.Cluster, error) {

clusterctl/cmd/delete.go

@@ -27,6 +27,5 @@ var deleteCmd = &cobra.Command{
 }
 
 func init() {
-	deleteCmd.AddCommand(NewCmdDeleteCluster())
 	RootCmd.AddCommand(deleteCmd)
 }

clusterctl/cmd/delete_cluster.go

@@ -46,6 +46,10 @@ func NewCmdDeleteCluster() *cobra.Command {
 	return cmd
 }
 
+func init() {
+	deleteCmd.AddCommand(NewCmdDeleteCluster())
+}
+
 func RunDelete() error {
 	return errors.NotImplementedError
 }

clusterctl/cmd/root.go

@@ -54,5 +54,4 @@ func init() {
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 
 	logs.InitLogs()
-	RootCmd.AddCommand(createCmd)
 }