Update olm-testing tooling

README.md

@@ -76,11 +76,12 @@ use this to inject your quay account name.
 #### Install federation using OLM
 
 Run the `scripts/install-using-catalog-source.sh` script to install federation
-into the `federation-test` namespace using OLM. This script also takes your
-quay account name as an argument:
+into the `federation-test` namespace using OLM. This script takes your quay
+account name as an argument, and optionally the type of deployment to subscribe
+to:
 
 ```
-$ scripts/install-using-catalog-source.sh pmorie
+$ scripts/install-using-catalog-source.sh pmorie <namespaced|cluster-scoped>
 catalogsource.operators.coreos.com/federation unchanged
 operatorgroup.operators.coreos.com/federation unchanged
 subscription.operators.coreos.com/federation unchanged

scripts/install-using-catalog-source.sh

@@ -16,13 +16,18 @@
 dir=$(realpath "$(dirname "${BASH_SOURCE}")/..")
 subscription_type=${2:-"namespaced"}
 
+declare -a subscription_types=("namespaced" "cluster-scoped")
+if ! [[ $subscription_types =~ (^|[[:space:]])"$subscription_type"($|[[:space:]]) ]] ; then
+  echo "${subscription_type} is an invalid type to subscribe to; use ${subscription_types}"
+  exit 1
+fi
+
 registry=${REGISTRY:-$1}
 if [[ -z "${registry}" ]]; then
   echo "registry must be set by running \`install-using-catalog-source.sh <registry>\` or by setting \$REGISTRY"
   exit 1
 fi
 
 sed -e "s,quay.io/openshift/federation-operator-registry,quay.io/$registry/federation-operator-registry," $dir/olm-testing/catalog-source.yaml | oc apply -f -
-oc apply -f $dir/olm-testing/operator-group.yaml
-oc apply -f $dir/olm-testing/cluster-scoped-operator-group.yaml
+oc apply -f $dir/olm-testing/${subscription_type}-operator-group.yaml
 oc apply -f $dir/olm-testing/${subscription_type}-subscription.yaml