chore: clean up add-on args

Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>

Author: dhaiducek

pkg/cmd/install/hubaddon/cmd.go

@@ -48,14 +48,9 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 		},
 	}
 
-	cmd.Flags().StringVar(&o.names, "names", "", "Names of the built-in add-on to install (comma separated). The built-in add-ons are: argocd, argocd-agent, governance-policy-framework")
-	cmd.Flags().StringVar(&o.values.Namespace, "namespace", "open-cluster-management", "Namespace of the built-in add-on to install. Defaults to open-cluster-management")
-	cmd.Flags().BoolVar(&o.values.CreateNamespace, "create-namespace", false, "If true, automatically create the specified namespace")
-	cmd.Flags().StringVar(&o.outputFile, "output-file", "", "The generated resources will be copied in the specified file")
-	cmd.Flags().StringVar(&o.bundleVersion, "bundle-version", "default",
-		"The image version tag to use when deploying the hub add-on(s) (e.g. v0.6.0). Defaults to the latest released version. You can also set \"latest\" to install the latest development version.")
-	cmd.Flags().StringVar(&o.versionBundleFile, "bundle-version-overrides", "",
-		"Path to a file containing version bundle overrides. Optional. If provided, overrides component versions within the selected version bundle.")
+	cmd.Flags().StringVar(&o.names, "names", "", "Names of the add-ons to install (comma separated) from the "+chartRepoURL+" repository. The built-in add-ons are: argocd, argocd-agent, governance-policy-framework")
+	cmd.Flags().StringVar(&o.namespace, "namespace", "", "Namespace in which to install the add-ons. If not provided, the add-ons will be installed according to their chart.")
+	cmd.Flags().BoolVar(&o.createNamespace, "create-namespace", false, "If true, automatically create the specified namespace.")
 	cmd.Flags().StringVar(&o.chartVersion, "chart-version", "", "The chart version to use when deploying the hub add-on(s) (e.g. 0.6.0). Defaults to an empty string, which will fetch the latest released version.")
 
 	return cmd

pkg/cmd/install/hubaddon/exec.go

@@ -18,7 +18,7 @@ const (
 )
 
 func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
-	klog.V(1).InfoS("addon options:", "dry-run", o.ClusteradmFlags.DryRun, "names", o.names, "output-file", o.outputFile)
+	klog.V(1).InfoS("addon options:", "dry-run", o.ClusteradmFlags.DryRun, "names", o.names)
 	return nil
 }
 

pkg/cmd/install/hubaddon/options.go

@@ -3,21 +3,19 @@ package hubaddon
 
 import (
 	"k8s.io/cli-runtime/pkg/genericiooptions"
-
-	"open-cluster-management.io/clusteradm/pkg/cmd/install/hubaddon/scenario"
 	genericclioptionsclusteradm "open-cluster-management.io/clusteradm/pkg/genericclioptions"
 	"open-cluster-management.io/clusteradm/pkg/helpers/helm"
 )
 
 type Options struct {
-	//ClusteradmFlags: The generic options from the clusteradm cli-runtime.
+	//ClusteradmFlags: The generic options from the clusteradm cli-runtime
 	ClusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags
 	//A list of comma separated addon names
 	names string
-	//The file to output the resources will be sent to the file.
-	outputFile    string
-	values        scenario.Values
-	bundleVersion string
+	// The namespace in which to install the hub add-on(s)
+	namespace string
+	// Whether to create the hub add-on namespace during install
+	createNamespace bool
 	// The chart version to use when deploying the hub add-on(s)
 	chartVersion string
 

pkg/cmd/uninstall/hubaddon/cmd.go

@@ -49,7 +49,7 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 	}
 
 	cmd.Flags().StringVar(&o.names, "names", "", "Names of the built-in add-on to uninstall (comma separated). The built-in add-ons are: argocd, argocd-agent, governance-policy-framework")
-	cmd.Flags().StringVar(&o.values.Namespace, "namespace", "open-cluster-management", "Namespace of the built-in add-on to uninstall. Defaults to open-cluster-management")
+	cmd.Flags().StringVar(&o.namespace, "namespace", "", "Namespace from which to uninstall the add-ons. If not provided, the add-ons will be uninstalled according to their chart.")
 
 	return cmd
 }

pkg/cmd/uninstall/hubaddon/options.go

@@ -3,8 +3,6 @@ package hubaddon
 
 import (
 	"k8s.io/cli-runtime/pkg/genericiooptions"
-
-	"open-cluster-management.io/clusteradm/pkg/cmd/install/hubaddon/scenario"
 	genericclioptionsclusteradm "open-cluster-management.io/clusteradm/pkg/genericclioptions"
 	"open-cluster-management.io/clusteradm/pkg/helpers/helm"
 )
@@ -14,8 +12,8 @@ type Options struct {
 	ClusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags
 	//A list of comma separated addon names
 	names string
-	//The file to output the resources will be sent to the file.
-	values scenario.Values
+	//The namespace from which to uninstall the hub add-on(s)
+	namespace string
 
 	Streams genericiooptions.IOStreams