Merge pull request #987 from jpeeler/local-ns-rename

fix(deploy): change local deploy to use olm namespace

Author: openshift-merge-robot

Documentation/install/install.md

@@ -36,15 +36,15 @@ Here's an example `values.yaml`
 # sets the apiversion to use for rbac-resources. Change to `authorization.openshift.io` for openshift
 rbacApiVersion: rbac.authorization.k8s.io
 # namespace is the namespace the operators will _run_
-namespace: local
+namespace: olm
 # watchedNamespaces is a comma-separated list of namespaces the operators will _watch_ for OLM resources.
 # Omit to enable OLM in all namespaces
-watchedNamespaces: local
+watchedNamespaces: olm
 # catalog_namespace is the namespace where the catalog operator will look for global catalogs.
 # entries in global catalogs can be resolved in any watched namespace
-catalog_namespace: local
+catalog_namespace: olm
 # operator_namespace is the namespace where the operator runs
-operator_namespace: local
+operator_namespace: operators
 
 # OLM operator run configuration
 olm:
@@ -98,19 +98,21 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: etcd
-  namespace: local
+  namespace: olm
 spec:
-  channel: alpha
+  channel: singlenamespace-alpha
   name: etcd
-  source: rh-operators
+  source: operatorhubio-catalog
+  sourceNamespace: olm
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: prometheus
-  namespace: local
+  namespace: olm
 spec:
   channel: alpha
   name: prometheus
-  source: rh-operators
+  source: operatorhubio-catalog
+  sourceNamespace: olm
 ```

Documentation/install/local-values.yaml

@@ -1,9 +1,9 @@
 installType: upstream
 rbacApiVersion: rbac.authorization.k8s.io
-namespace: local
+namespace: olm
 writeStatusName: '""'
-catalog_namespace: local
-operator_namespace: local-operators
+catalog_namespace: olm
+operator_namespace: operators
 debug: true
 
 olm:

Makefile

@@ -14,6 +14,7 @@ MOCKGEN := ./scripts/generate_mocks.sh
 IMAGE_REPO := quay.io/operator-framework/olm
 IMAGE_TAG ?= "dev"
 SPECIFIC_UNIT_TEST := $(if $(TEST),-run $(TEST),)
+LOCAL_NAMESPACE := "olm"
 export GO111MODULE=on
 
 # ART builds are performed in dist-git, with content (but not commits) copied 
@@ -75,13 +76,13 @@ run-local: build-linux
 	. ./scripts/build_local.sh
 	mkdir -p build/resources
 	. ./scripts/package_release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
-	. ./scripts/install_local.sh local build/resources
+	. ./scripts/install_local.sh $(LOCAL_NAMESPACE) build/resources
 	rm -rf build
 
 deploy-local:
 	mkdir -p build/resources
 	. ./scripts/package_release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
-	. ./scripts/install_local.sh local build/resources
+	. ./scripts/install_local.sh $(LOCAL_NAMESPACE) build/resources
 	rm -rf build
 
 e2e.namespace:

README.md

@@ -96,11 +96,12 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: etcd
-  namespace: local 
+  namespace: olm
 spec:
-  channel: alpha
+  channel: singlenamespace-alpha
   name: etcd
-  source: rh-operators
+  source: operatorhubio-catalog
+  sourceNamespace: olm
 ```
 
 This will keep the etcd `ClusterServiceVersion` up to date as new versions become available in the catalog.

pkg/controller/install/attributes_util_test.go

@@ -14,7 +14,7 @@ func TestToAttributeSet(t *testing.T) {
 	user := &user.DefaultInfo{
 		Name: "Jim",
 	}
-	namespace := "local"
+	namespace := "olm"
 
 	tests := []struct {
 		description        string