Merge pull request #236 from projectsyn/feat/expose-csi-operator-image

Add top-level parameter for Ceph CSI operator image

Author: simu

class/defaults.yml

@@ -248,6 +248,10 @@ parameters:
         registry: quay.io
         image: cephcsi/cephcsi
         tag: v3.15.1
+      ceph-csi-operator:
+        registry: quay.io
+        image: cephcsi/ceph-csi-operator
+        tag: v0.4.1
       oc:
         registry: quay.io
         repository: appuio/oc
@@ -272,6 +276,12 @@ parameters:
           cpu: 750m
           memory: 512Mi
       tolerations: ${rook_ceph:tolerations}
+      ceph-csi-operator:
+        controllerManager:
+          manager:
+            image:
+              repository: ${rook_ceph:images:ceph-csi-operator:registry}/${rook_ceph:images:ceph-csi-operator:image}
+              tag: ${rook_ceph:images:ceph-csi-operator:tag}
       csi:
         provisionerTolerations: ${rook_ceph:tolerations}
         enableCSIHostNetwork: true

docs/modules/ROOT/pages/references/parameters.adoc

@@ -489,7 +489,7 @@ The component assumes that nodes on which the deployments should be scheduled ma
 type:: dict
 default:: See https://github.com/projectsyn/component-rook-ceph/blob/master/class/defaults.yml[`class/defaults.yml` on Github]
 
-This parameter allows selecting the Docker images to use for Rook.io, Ceph, and Ceph-CSI.
+This parameter allows selecting the Docker images to use for Rook.io, Ceph, the Ceph CSI operator, and Ceph-CSI.
 Each image is specified using keys `registry`, `image` and `tag`.
 This structure allows easily injecting a registry mirror, if required.
 
@@ -521,7 +521,7 @@ The Helm values to use when rendering the rook-ceph operator Helm chart.
 
 A few Helm values are configured based on other component parameters by default:
 
-* The data in parameter `images` is used to set the `image.repository`, `image.tag`, `csi.cephcsi.repository`, and `csi.cephcsi.tag` Helm values
+* The data in parameter `images` is used to set the `image.repository`, `image.tag`, `ceph-csi-operator.controllerManager.manager.image.repository`, `ceph-csi-operator.controllerManager.manager.image.tag`, `csi.cephcsi.repository`, and `csi.cephcsi.tag` Helm values
 * The value of `node_selector` is used to set Helm value `nodeSelector`
 * The value of `tolerations` is used to set Helm value `tolerations`
 * The component ensures that `hostpathRequiresPrivileged` is enabled on OpenShift 4 regardless of the contents of the Helm value.