Update to work with latest OLM

Author: jcrossley3

README.md

@@ -3,9 +3,21 @@
 To install the operators in your cluster running the
 [OLM](https://github.com/operator-framework/operator-lifecycle-manager):
 
-    $ kubectl apply -f https://raw.githubusercontent.com/openshift-cloud-functions/knative-operators/master/knative-operators.catalogsource.yaml
+    # Namespace should be what the OLM catalog operator is watching
+    $ kubectl apply -n operator-lifecycle-manager -f https://raw.githubusercontent.com/openshift-cloud-functions/knative-operators/master/knative-operators.catalogsource.yaml
 
 To regenerate the `CatalogSource` and its associated `ConfigMap` from
 the source files beneath [olm-catalog/](olm-catalog/):
 
     $ ./etc/scripts/catalog.sh >knative-operators.catalogsource.yaml
+
+To install everything on a fresh minishift:
+
+    $ ./etc/scripts/install-on-minishift.sh
+
+To install everything on any OpenShift cluster:
+
+    $ oc login <<< with plenty of admin creds >>>
+    $ export KUBE_SSH_USER=ec2-user
+    $ export KUBE_SSH_KEY=~/.ssh/ocp-workshop.pem
+    $ ./etc/scripts/install.sh

etc/scripts/installation-functions.sh

@@ -119,8 +119,9 @@ function install_olm {
   oc adm policy add-cluster-role-to-user cluster-admin system:serviceaccount:kube-system:default
 
   # knative catalog source
-  oc apply -f "$ROOT_DIR/knative-operators.catalogsource.yaml"
-  oc apply -f "$ROOT_DIR/maistra-operators.catalogsource.yaml"
+  local OLM_NS=$(grep "catalog_namespace:" "$OLM_DIR/deploy/okd/values.yaml" | awk '{print $2}')
+  oc apply -f "$ROOT_DIR/knative-operators.catalogsource.yaml" -n "$OLM_NS"
+  oc apply -f "$ROOT_DIR/maistra-operators.catalogsource.yaml" -n "$OLM_NS"
 }
 
 function install_istio {

knative-operators.catalogsource.yaml

@@ -69,24 +69,6 @@ data:
           plural: clusterbuildtemplates
         scope: Cluster
         version: v1alpha1
-    - apiVersion: apiextensions.k8s.io/v1beta1
-      kind: CustomResourceDefinition
-      metadata:
-        name: images.caching.internal.knative.dev
-      spec:
-        group: caching.internal.knative.dev
-        names:
-          categories:
-          - all
-          - knative-internal
-          - caching
-          kind: Image
-          plural: images
-          shortNames:
-          - img
-          singular: image
-        scope: Namespaced
-        version: v1alpha1
     - apiVersion: apiextensions.k8s.io/v1beta1
       kind: CustomResourceDefinition
       metadata:
@@ -783,6 +765,16 @@ data:
         maturity: alpha
         replaces: knative-build.v0.1.2
 
+        installModes:
+        - supported: true
+          type: OwnNamespace
+        - supported: true
+          type: SingleNamespace
+        - supported: true
+          type: MultiNamespace
+        - supported: true
+          type: AllNamespaces
+
         install:
           strategy: deployment
           spec:
@@ -1157,6 +1149,16 @@ data:
         maturity: alpha
         replaces: knative-eventing.v0.2.0
 
+        installModes:
+        - supported: true
+          type: OwnNamespace
+        - supported: true
+          type: SingleNamespace
+        - supported: true
+          type: MultiNamespace
+        - supported: true
+          type: AllNamespaces
+
         install:
           strategy: deployment
           spec:
@@ -2282,6 +2284,16 @@ data:
         maturity: alpha
         replaces: knative-serving.v0.2.1
 
+        installModes:
+        - supported: true
+          type: OwnNamespace
+        - supported: true
+          type: SingleNamespace
+        - supported: true
+          type: MultiNamespace
+        - supported: true
+          type: AllNamespaces
+
         install:
           strategy: deployment
           spec:

maistra-operators.catalogsource.yaml

@@ -2,7 +2,6 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: maistra-operators
-  namespace: openshift-operator-lifecycle-manager
 
 data:
   customResourceDefinitions: |-
@@ -36,6 +35,15 @@ data:
         links:
         - name: Documentation
           url: https://maistra.io
+        installModes:
+        - supported: true
+          type: OwnNamespace
+        - supported: true
+          type: SingleNamespace
+        - supported: true
+          type: MultiNamespace
+        - supported: true
+          type: AllNamespaces
         install:
           strategy: deployment
           spec:
@@ -135,7 +143,6 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
   name: maistra-operators
-  namespace:  openshift-operator-lifecycle-manager
 spec:
   sourceType: internal
   configMap: maistra-operators

olm-catalog/knative-build.crd.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -63,22 +64,3 @@ spec:
     plural: clusterbuildtemplates
   scope: Cluster
   version: v1alpha1
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: images.caching.internal.knative.dev
-spec:
-  group: caching.internal.knative.dev
-  names:
-    categories:
-    - all
-    - knative-internal
-    - caching
-    kind: Image
-    plural: images
-    shortNames:
-    - img
-    singular: image
-  scope: Namespaced
-  version: v1alpha1

olm-catalog/knative-build.v0.2.0.clusterserviceversion.yaml

@@ -10,6 +10,16 @@ spec:
   maturity: alpha
   replaces: knative-build.v0.1.2
 
+  installModes:
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: true
+    type: MultiNamespace
+  - supported: true
+    type: AllNamespaces
+
   install:
     strategy: deployment
     spec:

olm-catalog/knative-eventing.v0.2.1.clusterserviceversion.yaml

@@ -10,6 +10,16 @@ spec:
   maturity: alpha
   replaces: knative-eventing.v0.2.0
 
+  installModes:
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: true
+    type: MultiNamespace
+  - supported: true
+    type: AllNamespaces
+
   install:
     strategy: deployment
     spec:

olm-catalog/knative-serving.v0.2.2.clusterserviceversion.yaml

@@ -10,6 +10,16 @@ spec:
   maturity: alpha
   replaces: knative-serving.v0.2.1
 
+  installModes:
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: true
+    type: MultiNamespace
+  - supported: true
+    type: AllNamespaces
+
   install:
     strategy: deployment
     spec: