Merge pull request #9949 from ecordell/olm-updates

OLM fixes

roles/olm/files/olm-operator.clusterrole.yaml

@@ -0,0 +1,10 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: system:controller:operator-lifecycle-manager
+rules:
+- apiGroups: ["*"]
+  resources: ["*"]
+  verbs: ["*"]
+- nonResourceURLs: ["*"]
+  verbs: ["*"]

roles/olm/files/olm-operator.rolebinding.yaml

@@ -5,7 +5,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: cluster-admin
+  name: system:controller:operator-lifecycle-manager
 subjects:
 - kind: ServiceAccount
   name: olm-operator-serviceaccount

roles/olm/files/ocs.catalogsource.yaml

@@ -1,11 +1,11 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
-  name: ocs
+  name: rh-operators
   namespace: operator-lifecycle-manager
 spec:
   sourceType: internal
-  configMap: ocs
-  displayName: Open Cloud Services
+  configMap: rh-operators
+  displayName: Red Hat Operators
   publisher: Red Hat
 

roles/olm/tasks/install.yaml

@@ -23,14 +23,14 @@
     src: olm-operator.deployment.j2
     dest: "{{ mktemp.stdout  }}/olm-operator.deployment.yaml"
   vars:
-    namespace: "{{ openshift_cluster_monitoring_operator_namespace }}"
+    namespace: operator-lifecycle-manager
 
 - name: Set catalog-operator template
   template:
     src: catalog-operator.deployment.j2
     dest: "{{ mktemp.stdout  }}/catalog-operator.deployment.yaml"
   vars:
-    namespace: "{{ openshift_cluster_monitoring_operator_namespace }}"
+    namespace: operator-lifecycle-manager
 
 - name: Apply olm-operator-serviceaccount ServiceAccount manifest
   oc_obj:

roles/olm/tasks/main.yaml

@@ -0,0 +1,8 @@
+---
+# do any asserts here
+
+- include_tasks: install.yaml
+  when: operator_lifecycle_manager_install | bool
+
+- include_tasks: remove.yaml
+  when: operator_lifecycle_manager_remove | bool