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.
-  - manager_auth_proxy_patch.yaml
+patchesStrategicMerge:
-
+- manager_auth_proxy_patch.yaml
-# Mount the controller config file for loading manager configurations
+apiVersion: kustomize.config.k8s.io/v1beta1
-# through a ComponentConfig type
+kind: Kustomization
-# - manager_config_patch.yaml
+resources:
+- ../crd
+- ../rbac
+- ../manager

config/manager/kustomization.yaml

@@ -1,15 +1,14 @@
----
 resources:
-  - manager.yaml
+- manager.yaml
 generatorOptions:
   disableNameSuffixHash: true
 configMapGenerator:
-  - files:
+- files:
-      - controller_manager_config.yaml
+  - controller_manager_config.yaml
-    name: manager-config
+  name: manager-config
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
-  - name: controller
+- 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:
@@ -13,27 +12,27 @@ spec:
   description: An operator for the AWX Project
   displayName: AWX
   icon:
-    - base64data: ""
+  - base64data: ""
-      mediatype: ""
+    mediatype: ""
   install:
     spec:
       deployments: null
     strategy: ""
   installModes:
-    - supported: false
+  - supported: true
-      type: OwnNamespace
+    type: OwnNamespace
-    - supported: false
+  - supported: true
-      type: SingleNamespace
+    type: SingleNamespace
-    - supported: false
+  - supported: true
-      type: MultiNamespace
+    type: MultiNamespace
-    - supported: true
+  - supported: false
-      type: AllNamespaces
+    type: AllNamespaces
   keywords:
-    - automation
+  - automation
-    - ansible
+  - ansible
   links:
-    - name: Awx Operator
+  - name: Awx Operator
-      url: https://awx-operator.domain
+    url: https://awx-operator.domain
   maturity: alpha
   provider:
     name: Ansible