Merge pull request #591 from jpeeler/global-namespace

ecordell · web-flow · commit cbb0c00c927c · 2018-12-07T09:27:01.000-05:00
Add operator namespace
diff --git a/Documentation/install/install.md b/Documentation/install/install.md
@@ -22,6 +22,7 @@ repo is periodically synced with openshift-ansible and should only be used for t
 ## Run locally with minikube
 
 This command starts minikube, builds the OLM containers locally with the minikube-provided docker, and uses the local configuration in [local-values.yaml](local-values.yaml) to build localized deployment resources for OLM.
+
 ```
 make run-local
 ```
@@ -57,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:
@@ -87,18 +90,18 @@ To configure a release of OLM for installation in a cluster:
 
 1. Create a `my-values.yaml` like the example above with the desired configuration or choose an existing one from this repository. The latest production values can be found in [deploy/tectonic-alm-operator/values.yaml](../../deploy/tectonic-alm-operator/values.yaml).
 1. Generate deployment files from the templates and the `my-values.yaml` using `package-release.sh`
+
    ```bash
    # first arg must be a semver-compatible version string
    # second arg is the output directory
    # third arg is the values.yaml file
    ./scripts/package-release.sh 1.0.0-myolm ./my-olm-deployment my-values.yaml
    ```
-1. Deploy to kubernetes: `kubectl apply -f ./my-olm-deployment/templates/`
 
+1. Deploy to kubernetes: `kubectl apply -f ./my-olm-deployment/templates/`
 
 The above steps are automated for official releases with `make ver=0.3.0 release`, which will output new versions of manifests in `deploy/tectonic-alm-operator/manifests/$(ver)`.
 
-
 ## Subscribe to a Package and Channel
 
 Cloud Services can be installed from the catalog by subscribing to a channel in the corresponding package.
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,44 +6,51 @@ 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
+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}
- 	rm -rf test/e2e/resources
- 	rm -rf test/e2e/test-resources
+	for resource in test/e2e/test-resources/*.yaml; do
+		[ -e "$resource" ] || continue
+		echo "Running kubectl delete -f $resource..."
+		kubectl delete -f "$resource" &> /dev/null || continue
+	done
+	rm -rf test/e2e/resources
+	rm -rf test/e2e/test-resources
 }
 
 function cleanupAndExit {
 	exitCode=$?
 	if [ "$exitCode" -ne "0" ]; then
 		echo "error running tests. logs written to olm.log and catalog.log";
-		kubectl -n ${namespace} logs -l app=alm-operator > olm.log;
-		kubectl -n ${namespace} logs -l app=catalog-operator > catalog.log;
-		kubectl -n ${namespace} logs -l app=package-server > package.log
+		kubectl -n "${namespace}" logs -l app=alm-operator > olm.log;
+		kubectl -n "${namespace}" logs -l app=catalog-operator > catalog.log;
+		kubectl -n "${namespace}" logs -l app=package-server > package.log
 	fi
 	cleanup
     exit $exitCode
 }
 
 trap cleanupAndExit SIGINT SIGTERM EXIT
 
-./scripts/install_local.sh ${namespace} test/e2e/resources
+./scripts/install_local.sh "${namespace}" test/e2e/resources
 
 mkdir -p test/e2e/test-resources
-helm template --set namespace=${namespace}  -f test/e2e/e2e-values.yaml test/e2e/chart  --output-dir test/e2e/test-resources
+helm template --set namespace="${namespace}"  -f test/e2e/e2e-values.yaml test/e2e/chart  --output-dir test/e2e/test-resources
 
-eval $(minikube docker-env) || { echo 'Cannot switch to minikube docker'; exit 1; }
+eval "$(minikube docker-env)" || { echo 'Cannot switch to minikube docker'; exit 1; }
 kubectl apply -f test/e2e/test-resources/alm-e2e/templates
-until kubectl -n ${namespace} logs job/e2e | grep -v "ContainerCreating"; do echo "waiting for job to run" && sleep 1; done
-kubectl -n ${namespace} logs job/e2e -f
+until kubectl -n "${namespace}" logs job/e2e | grep -v "ContainerCreating"; do echo "waiting for job to run" && sleep 1; done
+kubectl -n "${namespace}" logs job/e2e -f
 
 
diff --git a/scripts/run_e2e_local.sh b/scripts/run_e2e_local.sh
@@ -7,28 +7,35 @@ 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
+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}
- 	rm -rf test/e2e/resources
+	for resource in test/e2e/resources/*.yaml; do
+		[ -e "$resource" ] || continue
+		echo "Running kubectl delete -f $resource..."
+		kubectl delete -f "$resource" &> /dev/null || continue
+	done
+	rm -rf test/e2e/resources
 }
 
 function cleanupAndExit {
 	exitCode=$?
 	if [ "$exitCode" -ne "0" ]; then
 		echo "error running tests. logs written to olm.log, catalog.log, and package.log";
-		kubectl -n ${namespace} logs -l app=olm-operator > olm.log;
-		kubectl -n ${namespace} logs -l app=catalog-operator > catalog.log;
-		kubectl -n ${namespace} logs -l app=package-server > package.log
+		kubectl -n "${namespace}" logs -l app=olm-operator > olm.log;
+		kubectl -n "${namespace}" logs -l app=catalog-operator > catalog.log;
+		kubectl -n "${namespace}" logs -l app=package-server > package.log
 	else
 		cleanup
 	fi
@@ -38,7 +45,7 @@ function cleanupAndExit {
 
 trap cleanupAndExit SIGINT SIGTERM EXIT
 
-./scripts/install_local.sh ${namespace} test/e2e/resources
+./scripts/install_local.sh "${namespace}" test/e2e/resources
 
 # run tests
 if [ -z "$1" ]; then
