feat(deploy): add operator group to watch all namespaces

Jeff Peeler · Jeff Peeler · commit 02fab2ed2a70 · 2018-12-06T16:31:56.000-05:00
This adds a default operator group to watch all namespaces. A new helm variable
has been added called `operator_namespace` and the OLM deployment has been
modified to watch all namespaces as well.
diff --git a/Documentation/install/install.md b/Documentation/install/install.md
@@ -58,6 +58,8 @@ watchedNamespaces: local
 # 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
+# operator_namespace is the namespace where the operator runs
+operator_namespace: local
 
 # OLM operator run configuration
 olm:
diff --git a/Documentation/install/local-values-shift.yaml b/Documentation/install/local-values-shift.yaml
@@ -2,6 +2,7 @@ rbacApiVersion: authorization.openshift.io
 namespace: local
 watchedNamespaces: local
 catalog_namespace: local
+operator_namespace: local
 debug: true
 
 olm:
diff --git a/Documentation/install/local-values.yaml b/Documentation/install/local-values.yaml
@@ -2,6 +2,7 @@ rbacApiVersion: rbac.authorization.k8s.io
 namespace: local
 watchedNamespaces: local
 catalog_namespace: local
+operator_namespace: local
 debug: true
 
 olm:
diff --git a/deploy/chart/templates/0000_30_00-namespace.yaml b/deploy/chart/templates/0000_30_00-namespace.yaml
@@ -4,3 +4,8 @@ metadata:
   name: {{ .Values.namespace }}
   labels:
     openshift.io/run-level: "1"
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.operator_namespace }}
diff --git a/deploy/chart/templates/0000_30_14-operatorgroup.crd.yaml b/deploy/chart/templates/0000_30_14-operatorgroup.crd.yaml
@@ -74,5 +74,4 @@ spec:
           - lastUpdated
           type: object
       required:
-      - metadata
-      - spec
+      - metadata
diff --git a/deploy/chart/templates/0000_30_15-operatorgroup-default.yaml b/deploy/chart/templates/0000_30_15-operatorgroup-default.yaml
@@ -0,0 +1,5 @@
+apiVersion: operators.coreos.com/v1alpha2
+kind: OperatorGroup
+metadata:
+  name: global-operators
+  namespace: {{ .Values.operator_namespace }}
diff --git a/deploy/chart/values.yaml b/deploy/chart/values.yaml
@@ -1,6 +1,7 @@
 rbacApiVersion: rbac.authorization.k8s.io
 namespace: operator-lifecycle-manager
 catalog_namespace: operator-lifecycle-manager
+operator_namespace: operators
 imagestream: false
 debug: false
 olm:
diff --git a/deploy/ocp/values.yaml b/deploy/ocp/values.yaml
@@ -1,6 +1,7 @@
 rbacApiVersion: rbac.authorization.k8s.io
 namespace: openshift-operator-lifecycle-manager
 catalog_namespace: openshift-operator-lifecycle-manager
+operator_namespace: openshift-operators
 imagestream: true
 olm:
   replicaCount: 1
@@ -25,4 +26,4 @@ package:
     internalPort: 5443
 catalog_sources:
 - rh-operators
-- certified-operators
+- certified-operators
diff --git a/deploy/okd/values.yaml b/deploy/okd/values.yaml
@@ -1,6 +1,7 @@
 rbacApiVersion: rbac.authorization.k8s.io
 namespace: openshift-operator-lifecycle-manager
 catalog_namespace: openshift-operator-lifecycle-manager
+operator_namespace: openshift-operators
 imagestream: false
 olm:
   replicaCount: 1
@@ -24,4 +25,4 @@ package:
   service:
     internalPort: 5443
 catalog_sources:
-- rh-operators
+- rh-operators
diff --git a/deploy/upstream/values.yaml b/deploy/upstream/values.yaml
@@ -1,6 +1,7 @@
 rbacApiVersion: rbac.authorization.k8s.io
 namespace: olm
 catalog_namespace: olm
+operator_namespace: operators
 imagestream: false
 olm:
   replicaCount: 1
@@ -24,4 +25,4 @@ package:
   service:
     internalPort: 5443
 catalog_sources:
-- rh-operators
+- rh-operators
diff --git a/manifests/0000_30_00-namespace.yaml b/manifests/0000_30_00-namespace.yaml
@@ -6,3 +6,8 @@ metadata:
   name: openshift-operator-lifecycle-manager
   labels:
     openshift.io/run-level: "1"
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-operators
diff --git a/manifests/0000_30_14-operatorgroup.crd.yaml b/manifests/0000_30_14-operatorgroup.crd.yaml
@@ -76,5 +76,4 @@ spec:
           - lastUpdated
           type: object
       required:
-      - metadata
-      - spec
+      - metadata
diff --git a/manifests/0000_30_15-operatorgroup-default.yaml b/manifests/0000_30_15-operatorgroup-default.yaml
@@ -0,0 +1,7 @@
+---
+# Source: olm/templates/0000_30_15-operatorgroup-default.yaml
+apiVersion: operators.coreos.com/v1alpha2
+kind: OperatorGroup
+metadata:
+  name: global-operators
+  namespace: openshift-operators
diff --git a/scripts/run_e2e_docker.sh b/scripts/run_e2e_docker.sh
@@ -6,15 +6,18 @@ set -e
 
 timestamp=$(date +%s)
 namespace="e2e-tests-${timestamp}-$RANDOM"
+operator_namespace="$namespace-operator"
 
 tmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'valuetmpdir')
-cp test/e2e/e2e-values.yaml "${tmpdir}/e2e-values.yaml"
+test_e2e_config=${tmpdir}/e2e-values.yaml
+cp test/e2e/e2e-values.yaml "$test_e2e_config"
 
-echo "namespace: ${namespace}" >> ${tmpdir}/e2e-values.yaml
-echo "watchedNamespaces: ${namespace}" >> ${tmpdir}/e2e-values.yaml
-echo "catalog_namespace: ${namespace}" >> ${tmpdir}/e2e-values.yaml
+{ echo "namespace: ${namespace}";
+  echo "watchedNamespaces: \"\"";
+  echo "catalog_namespace: ${namespace}";
+  echo "operator_namespace: ${operator_namespace}"; }  >> "$test_e2e_config"
 
-./scripts/package-release.sh 1.0.0-e2e test/e2e/resources "${tmpdir}/e2e-values.yaml"
+./scripts/package-release.sh 1.0.0-e2e test/e2e/resources "$test_e2e_config"
 
 function cleanup {
 	kubectl delete namespace "${namespace}"
diff --git a/scripts/run_e2e_local.sh b/scripts/run_e2e_local.sh
@@ -7,14 +7,18 @@ set -e
 
 timestamp=$(date +%s)
 namespace="e2e-tests-${timestamp}-$RANDOM"
+operator_namespace="$namespace-operator"
 
 tmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'valuetmpdir')
+test_e2e_config=${tmpdir}/e2e-values.yaml
+cp test/e2e/e2e-values.yaml "$test_e2e_config"
 
-echo "namespace: ${namespace}" >> ${tmpdir}/e2e-values.yaml
-#echo "watchedNamespaces: ${namespace}" >> ${tmpdir}/e2e-values.yaml
-echo "catalog_namespace: ${namespace}" >> ${tmpdir}/e2e-values.yaml
+{ echo "namespace: ${namespace}";
+  echo "watchedNamespaces: \"\"";
+  echo "catalog_namespace: ${namespace}";
+  echo "operator_namespace: ${operator_namespace}"; }  >> "$test_e2e_config"
 
-./scripts/package-release.sh 1.0.0-e2e test/e2e/resources ${tmpdir}/e2e-values.yaml
+./scripts/package-release.sh 1.0.0-e2e test/e2e/resources "$test_e2e_config"
 
 function cleanup {
 	kubectl delete namespace "${namespace}"
