allow install hub-addon specify ns

pkg/cmd/install/hubaddon/cmd.go

@@ -48,6 +48,7 @@ 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: application-manager, governance-policy-framework")
+	cmd.Flags().StringVar(&o.values.Namespace, "namespace", "open-cluster-management", "Namespace of the built-in add-on to install. Default to open-cluster-management")
 	cmd.Flags().StringVar(&o.outputFile, "output-file", "", "The generated resources will be copied in the specified file")
 
 	return cmd

pkg/cmd/install/hubaddon/exec_test.go

@@ -11,7 +11,10 @@ import (
 )
 
 const (
-	ocmNamespace           = "open-cluster-management"
+	invalidNamespace = "no-such-ns"
+	ocmNamespace     = "open-cluster-management"
+
+	invalidAddon           = "no-such-addon"
 	channelDeployment      = "multicluster-operators-channel"
 	subscriptionDeployment = "multicluster-operators-subscription"
 	propagatorDeployment   = "governance-policy-propagator"
@@ -33,7 +36,7 @@ var _ = ginkgo.Describe("install hub-addon", func() {
 
 			o := Options{
 				values: Values{
-					hubAddons: []string{"no-such-addon"},
+					hubAddons: []string{invalidAddon},
 				},
 			}
 
@@ -57,9 +60,22 @@ var _ = ginkgo.Describe("install hub-addon", func() {
 			}, consistentlyTimeout, consistentlyInterval).Should(gomega.HaveOccurred())
 		})
 
+		ginkgo.It("Should not create any built-in add-on deployment(s) because it's not a valid namespace", func() {
+			o := Options{
+				values: Values{
+					Namespace: invalidNamespace,
+					hubAddons: []string{appMgrAddonName},
+				},
+			}
+
+			err := o.runWithClient(kubeClient, apiExtensionsClient, dynamicClient, false)
+			gomega.Expect(err).Should(gomega.HaveOccurred())
+		})
+
 		ginkgo.It("Should deploy the built in application-manager add-on deployments in open-cluster-management namespace successfully", func() {
 			o := Options{
 				values: Values{
+					Namespace: ocmNamespace,
 					hubAddons: []string{appMgrAddonName},
 				},
 			}
@@ -84,10 +100,11 @@ var _ = ginkgo.Describe("install hub-addon", func() {
 			}, eventuallyTimeout, eventuallyInterval).ShouldNot(gomega.HaveOccurred())
 		})
 
-		ginkgo.It("Should deploy the built-in governance-policy-framework add-on deployments in open-cluster-management namespace successfully", func() {
+		ginkgo.It("Should deploy the built-in governance-policy-framework add-on deployments in open-cluster-management-hub namespace successfully", func() {
 			o := Options{
 				values: Values{
 					hubAddons: []string{policyFrameworkAddonName},
+					Namespace: ocmNamespace,
 				},
 			}
 

pkg/cmd/install/hubaddon/options.go

@@ -19,6 +19,8 @@ type Options struct {
 //Values: The values used in the template
 type Values struct {
 	hubAddons []string
+	// Namespace to install
+	Namespace string
 }
 
 func newOptions(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, streams genericclioptions.IOStreams) *Options {

pkg/cmd/install/hubaddon/scenario/addon/appmgr/clusterrole_binding.yaml

@@ -6,7 +6,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: multicluster-operators-subscription
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
 roleRef:
   kind: ClusterRole
   name: multicluster-operators-subscription

pkg/cmd/install/hubaddon/scenario/addon/appmgr/deployment_appsubsummary.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: multicluster-operators-appsub-summary
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
   labels:
     name: multicluster-operators-appsub-summary
 spec:

pkg/cmd/install/hubaddon/scenario/addon/appmgr/deployment_channel.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: multicluster-operators-channel
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
   labels:
     name: multicluster-operators-channel
 spec:

pkg/cmd/install/hubaddon/scenario/addon/appmgr/deployment_placementrule.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: multicluster-operators-placementrule
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
   labels:
     name: multicluster-operators-placementrule
 spec:

pkg/cmd/install/hubaddon/scenario/addon/appmgr/deployment_subscription.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: multicluster-operators-subscription
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
   labels:
     name: multicluster-operators-subscription
 spec:

pkg/cmd/install/hubaddon/scenario/addon/appmgr/service.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     name: multicluster-operators-subscription
   name: multicluster-operators-subscription
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
 spec:
   ports:
   - port: 8443

pkg/cmd/install/hubaddon/scenario/addon/appmgr/service_account.yaml

@@ -3,4 +3,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: multicluster-operators-subscription
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}

pkg/cmd/install/hubaddon/scenario/addon/policy/addon-controller_clusterrolebinding.yaml

@@ -12,4 +12,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: policy-addon-ctrl-controller-manager
-    namespace: open-cluster-management
+    namespace: {{ .Namespace }}

pkg/cmd/install/hubaddon/scenario/addon/policy/addon-controller_deployment.yaml

@@ -6,7 +6,7 @@ metadata:
     app: governance-policy-addon-controller
     control-plane: controller-manager
   name: governance-policy-addon-controller
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
 spec:
   replicas: 1
   selector:

pkg/cmd/install/hubaddon/scenario/addon/policy/addon-controller_role.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     app: governance-policy-addon-controller
   name: policy-addon-ctrl-leader-election-role
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
 rules:
   - apiGroups:
       - ""

pkg/cmd/install/hubaddon/scenario/addon/policy/addon-controller_rolebinding.yaml

@@ -5,12 +5,12 @@ metadata:
   labels:
     app: governance-policy-addon-controller
   name: policy-addon-ctrl-leader-election-rolebinding
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: policy-addon-ctrl-leader-election-role
 subjects:
   - kind: ServiceAccount
     name: policy-addon-ctrl-controller-manager
-    namespace: open-cluster-management
+    namespace: {{ .Namespace }}

pkg/cmd/install/hubaddon/scenario/addon/policy/addon-controller_serviceaccount.yaml

@@ -5,4 +5,4 @@ metadata:
   labels:
     app: governance-policy-addon-controller
   name: policy-addon-ctrl-controller-manager
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}

pkg/cmd/install/hubaddon/scenario/addon/policy/propagator_clusterrolebinding.yaml

@@ -10,4 +10,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: governance-policy-propagator
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}

pkg/cmd/install/hubaddon/scenario/addon/policy/propagator_deployment.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: governance-policy-propagator
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
 spec:
   replicas: 1
   selector:

pkg/cmd/install/hubaddon/scenario/addon/policy/propagator_role.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: governance-policy-propagator-leader-election-role
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
 rules:
 - apiGroups:
   - ""

pkg/cmd/install/hubaddon/scenario/addon/policy/propagator_rolebinding.yaml

@@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: governance-policy-propagator-leader-election-rolebinding
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: governance-policy-propagator-leader-election-role
 subjects:
 - kind: ServiceAccount
   name: governance-policy-propagator
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}

pkg/cmd/install/hubaddon/scenario/addon/policy/propagator_serviceaccount.yaml

@@ -3,4 +3,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: governance-policy-propagator
-  namespace: open-cluster-management
+  namespace: {{ .Namespace }}