Merge pull request #122 from cschwede/master

Catalog update

build/Dockerfile.catalog

@@ -0,0 +1,13 @@
+FROM quay.io/operator-framework/upstream-registry-builder as builder
+
+COPY . manifests
+RUN /bin/initializer -o ./bundles.db
+
+FROM scratch
+COPY --from=builder /etc/nsswitch.conf /etc/nsswitch.conf
+COPY --from=builder /bundles.db /bundles.db
+COPY --from=builder /bin/registry-server /registry-server
+COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
+EXPOSE 50051
+ENTRYPOINT ["/registry-server"]
+CMD ["--database", "bundles.db"]

build/olm-catalog/olm-csv-gen.sh

@@ -10,5 +10,7 @@ else
   dest_file=./out.yaml
 fi
 
+podman pull embercsi/ember-csi:$TAG
+
 echo "Getting driver config from tag $TAG and writing result to $dest_file"
 docker run --rm embercsi/ember-csi:$TAG ember-list-drivers -d | python ./yaml-options-gen.py > $dest_file

build/olm-catalog/template.yaml

@@ -10,17 +10,17 @@ metadata:
     certified: "false"
     support: http://readthedocs.org/projects/ember-csi/
     repository: https://github.com/embercsi/ember-csi-operator
-    createdAt: 2020-06-25:16:07:00
+    createdAt: 2021-02-22:17:47:00
     # BEGIN AUTO GENERATED EXAMPLES
 ${SAMPLE_CONFIG}
     # END AUTO GENERATED EXAMPLES
-  name: ember-csi-operator.v0.9.1
+  name: ember-csi-operator.v0.9.4
   namespace: ember-csi
 spec:
   apiservicedefinitions: {}
   maturity: beta
-  version: 0.9.1
-  replaces: ember-csi-operator.v0.9.0
+  version: 0.9.4
+  replaces: ember-csi-operator.v0.9.3
   minKubeVersion: 1.13.0
   description: |
     Ember-CSI is a multi-vendor CSI plugin driver supporting
@@ -30,6 +30,24 @@ spec:
     The operator adds support for management of multiple Ember CSI instances
     within a cluster and simplifies storage backend deployments.
 
+    ### Supported drivers
+    Ember-CSI includes a good number of storage drivers, but due to limitation on hardware availability only a small number of them have been validated at one point or another. In alphabetical order they are:
+
+    * HPE3PARFC
+    * HPE3PARISCSI
+    * KaminarioISCSI
+    * LVMVolume
+    * PowerMaxFC
+    * PowerMaxISCSI
+    * PureFC
+    * PureISCSI
+    * QnapISCSI
+    * RBD
+    * SolidFire
+    * SynoISCSI
+    * XtremIOFC
+    * XtremIOISCSI
+
     ### Getting started
     Please have a look at our quick start documentation on how to get started:
     [github.com/embercsi/ember-csi-operator#quick-start](https://github.com/embercsi/ember-csi-operator#quick-start).
@@ -129,6 +147,29 @@ spec:
           - '*'
           verbs:
           - '*'
+        - apiGroups:
+          - coordination.k8s.io
+          resources:
+          - leases
+          verbs:
+          - "get"
+          - "watch"
+          - "list"
+          - "delete"
+          - "update"
+          - "create"
+        - apiGroups:
+          - storage.k8s.io
+          resources:
+          - csistoragecapacities
+          verbs:
+          - "get"
+          - "list"
+          - "watch"
+          - "create"
+          - "update"
+          - "patch"
+          - "delete"
 
       clusterPermissions:
       - serviceAccountName: ember-csi-operator
@@ -173,8 +214,11 @@ spec:
           - ""
           resources:
           - nodes
+          - pods
           verbs:
-          - "*"
+          - get
+          - list
+          - watch
         - apiGroups:
           - ""
           resources:
@@ -222,6 +266,12 @@ spec:
           - delete
           - create
           - patch
+        - apiGroups:
+          - storage.k8s.io
+          resources:
+          - volumeattachments/status
+          verbs:
+          - patch
         - apiGroups:
           - storage.k8s.io
           resources:
@@ -245,6 +295,7 @@ spec:
           - watch
           - update
           - delete
+          - patch
         - apiGroups:
           - snapshot.storage.k8s.io
           resources:
@@ -282,6 +333,12 @@ spec:
           - list
           - watch
           - update
+        - apiGroups:
+          - snapshot.storage.k8s.io
+          resources:
+          - volumesnapshots/status
+          verbs:
+          - update
         - apiGroups:
           - csi.storage.k8s.io
           resources:

build/olm-catalog/yaml-options-gen.py

@@ -412,7 +412,7 @@ def render_option(option, driver, group_options=False):
           x-descriptors:
             - 'urn:alm:descriptor:com.tectonic.ui:fieldGroup:{group}'
             - {opt_type}
-            - 'urn:alm:descriptor:com.tectonic.ui:fieldDependency:spec.config.envVars.X_CSI_BACKEND_CONFIG.driver:{driver}'""".format(
+            - 'urn:alm:descriptor:com.tectonic.ui:fieldDependency:config.envVars.X_CSI_BACKEND_CONFIG.driver:{driver}'\n""".format(
                name=option.option_name(driver),  # noqa
                display_name=option.display_name,
                description='"' + option.help + '"',

deploy/examples/catalog.yaml

@@ -1,9 +1,8 @@
-apiVersion: operators.coreos.com/v1
-kind: OperatorSource
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
 metadata:
-  name: external-operators
+  name: ember-catalog
   namespace: openshift-marketplace
 spec:
-  type: appregistry
-  endpoint: https://quay.io/cnr
-  registryNamespace: embercsi
+  sourceType: grpc
+  image: quay.io/embercsi/embercsi-catalog:latest