Merge pull request #10004 from ecordell/olm-fix

Fix OLM installation

roles/olm/files/catalogsource.crd.yaml

@@ -37,15 +37,18 @@ spec:
   - name: Age
     type: date
     JSONPath: .metadata.creationTimestamp
+  subresources:
+  # status enables the status subresource.
+    status: {}
   validation:
     openAPIV3Schema:
-      type: object
-      description: Represents a subscription to a source and channel
-      required:
-      - spec
       properties:
         spec:
           type: object
+          description: Represents a subscription to a source and channel
+          required:
+          - spec
+          type: object
           description: Spec for a catalog source.
           required:
           - sourceType

roles/olm/files/clusterserviceversion.crd.yaml

@@ -282,6 +282,33 @@ spec:
                             value:
                               type: object
                               description: If present, the value of this spec is the same for all instances of the CRD and can be found here instead of on the CR.
+                      actionDescriptors:
+                        type: array
+                        items:
+                          type: object
+                          description: A spec for actions that can be performed on instances of the CRD
+                          required:
+                            - path
+                            - displayName
+                            - description
+                          properties:
+                            path:
+                              type: string
+                              description: A jsonpath indexing into the spec object on the CR where the the spec value can be found.
+                            displayName:
+                              type: string
+                              description: A human-readable name for the action.
+                            description:
+                              type: string
+                              description: A description of the action.
+                            x-descriptors:
+                              type: array
+                              description: A list of descriptors for the action that indicate the meaning of the action.
+                              items:
+                                type: string
+                            value:
+                              type: object
+                              description: If present, the value of this action is the same for all instances of the CRD and can be found here instead of on the CR.
                 required:
                   type: array
                   description: What resources this operator is responsible for managing. No two running operators should manage the same resource.

roles/olm/templates/catalog-operator.deployment.j2

@@ -1,5 +1,3 @@
-##---
-# Source: olm/templates/13-catalog-operator.deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -39,5 +37,4 @@ spec:
             httpGet:
               path: /healthz
               port: 8080
-      imagePullSecrets:
-        - name: coreos-pull-secret
+

roles/olm/templates/olm-operator.deployment.j2

@@ -1,27 +1,25 @@
-##---
-# Source: olm/templates/12-alm-operator.deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: alm-operator
+  name: olm-operator
   namespace: operator-lifecycle-manager
   labels:
-    app: alm-operator
+    app: olm-operator
 spec:
   strategy:
     type: RollingUpdate
   replicas: 1
   selector:
     matchLabels:
-      app: alm-operator
+      app: olm-operator
   template:
     metadata:
       labels:
-        app: alm-operator
+        app: olm-operator
     spec:
       serviceAccountName: olm-operator-serviceaccount
       containers:
-        - name: alm-operator
+        - name: olm-operator
           command:
           - /bin/olm
           image: {{ olm_operator_image }}
@@ -42,6 +40,4 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: OPERATOR_NAME
-            value: alm-operator
-      imagePullSecrets:
-        - name: coreos-pull-secret
+            value: olm-operator