Add ability to override namespace when running make deploy

Makefile

@@ -37,6 +37,7 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
 
 # Image URL to use all building/pushing image targets
 IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
+NAMESPACE ?= awx
 
 all: docker-build
 
@@ -77,6 +78,7 @@ uninstall: kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube
 
 deploy: kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/default && $(KUSTOMIZE) edit set namespace ${NAMESPACE}
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.

config/default/kustomization.yaml

@@ -1,6 +1,5 @@
----
 # Adds namespace to all resources.
-namespace: awx-operator-system
+namespace: awx
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
@@ -10,18 +9,16 @@ namePrefix: awx-operator-
 # Labels to add to all resources and selectors.
 # commonLabels:
 #   someName: someValue
-bases:
-  - ../crd
-  - ../rbac
-  - ../manager
   # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
   # - ../prometheus
-patchesStrategicMerge:
   # Protect the /metrics endpoint by putting it behind auth.
   # If you want your controller-manager to expose the /metrics
   # endpoint w/o any authn/z, please comment the following line.
+patchesStrategicMerge:
 - manager_auth_proxy_patch.yaml
-
+apiVersion: kustomize.config.k8s.io/v1beta1
-# Mount the controller config file for loading manager configurations
+kind: Kustomization
-# through a ComponentConfig type
+resources:
-# - manager_config_patch.yaml
+- ../crd
+- ../rbac
+- ../manager

config/manager/kustomization.yaml

@@ -1,4 +1,3 @@
----
 resources:
 - manager.yaml
 generatorOptions:
@@ -11,5 +10,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-    newName: quay.io/shanemcd/awx-operator
+  newName: quay.io/ansible/awx-operator
-    newTag: 0.0.1
+  newTag: 0.14.0

config/manifests/bases/awx-operator.clusterserviceversion.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: operators.coreos.com/v1beta1
 kind: ClusterServiceVersion
 metadata:
@@ -20,13 +19,13 @@ spec:
       deployments: null
     strategy: ""
   installModes:
-    - supported: false
-      type: OwnNamespace
-    - supported: false
-      type: SingleNamespace
-    - supported: false
-      type: MultiNamespace
   - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: true
+    type: MultiNamespace
+  - supported: false
     type: AllNamespaces
   keywords:
   - automation