From c7b861a21d729da0a4e5a86349efc8a290130bb8 Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Tue, 17 Sep 2019 13:45:04 +0530
Subject: [PATCH] Include CSI image in helm chart values

The Helm Chart should include values for the CSI
images so Rook with CSI can pull the required
images from a private container registry.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
---
 .../rook-ceph/templates/deployment.yaml       | 42 +++++++++++++++++--
 cluster/charts/rook-ceph/values.yaml          | 23 +++++++---
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/cluster/charts/rook-ceph/templates/deployment.yaml b/cluster/charts/rook-ceph/templates/deployment.yaml
index 245dc7ed5..801be12c9 100644
--- a/cluster/charts/rook-ceph/templates/deployment.yaml
+++ b/cluster/charts/rook-ceph/templates/deployment.yaml
@@ -93,12 +93,48 @@ spec:
           value: "{{ .Values.enableSelinuxRelabeling }}"
         - name: ROOK_DISABLE_DEVICE_HOTPLUG
           value: "{{ .Values.disableDeviceHotplug }}"
+{{- if .Values.csi }}
         - name: ROOK_CSI_ENABLE_RBD
-          value: "{{ .Values.enableCsiRbdDriver }}"
+          value: {{ .Values.csi.enableRbdDriver | quote }}
+{{- end }}
+{{- if .Values.csi }}
         - name: ROOK_CSI_ENABLE_CEPHFS
-          value: "{{ .Values.enableCsiCephfsDriver }}"
+          value: {{ .Values.csi.enableCephfsDriver | quote }}
+{{- end }}
+{{- if .Values.csi }}
         - name: ROOK_CSI_ENABLE_GRPC_METRICS
-          value: "{{ .Values.enableCsiGrpcMetrics }}"
+          value: {{ .Values.csi.enableGrpcMetrics | quote }}
+{{- end }}
+{{- if .Values.csi.cephcsi }}
+{{- if .Values.csi.cephcsi.image }}
+        - name: ROOK_CSI_CEPH_IMAGE
+          value: {{ .Values.csi.cephcsi.image | quote }}
+{{- end }}
+{{- end }}
+{{- if .Values.csi.registrar }}
+{{- if .Values.csi.registrar.image }}
+        - name: ROOK_CSI_REGISTRAR_IMAGE
+          value: {{ .Values.csi.registrar.image | quote }}
+{{- end }}
+{{- end }}
+{{- if .Values.csi.provisioner }}
+{{- if .Values.csi.provisioner.image }}
+        - name: ROOK_CSI_PROVISIONER_IMAGE
+          value: {{ .Values.csi.provisioner.image | quote }}
+{{- end }}
+{{- end }}
+{{- if .Values.csi.snapshotter }}
+{{- if .Values.csi.snapshotter.image }}
+        - name: ROOK_CSI_SNAPSHOTTER_IMAGE
+          value: {{ .Values.csi.snapshotter.image | quote }}
+{{- end }}
+{{- end }}
+{{- if .Values.csi.attacher }}
+{{- if .Values.csi.attacher.image }}
+        - name: ROOK_CSI_ATTACHER_IMAGE
+          value: {{ .Values.csi.attacher.image | quote }}
+{{- end }}
+{{- end }}
         - name: ROOK_ENABLE_FLEX_DRIVER
           value: "{{ .Values.enableFlexDriver }}"
         - name: ROOK_ENABLE_DISCOVERY_DAEMON
diff --git a/cluster/charts/rook-ceph/values.yaml b/cluster/charts/rook-ceph/values.yaml
index e7d0f3c96..9b12e3019 100644
--- a/cluster/charts/rook-ceph/values.yaml
+++ b/cluster/charts/rook-ceph/values.yaml
@@ -53,11 +53,24 @@ rbacEnable: true
 ##
 pspEnable: true
 
-## Settings for whether to disable the drivers or other daemons if they are not needed
-enableCsiRbdDriver: true
-enableCsiCephfsDriver: true
-enableCsiGrpcMetrics: true
-enableFlexDriver: false
+## Settings for whether to disable the drivers or other daemons if they are not
+## needed
+csi:
+  enableRbdDriver: true
+  enableCephfsDriver: true
+  enableGrpcMetrics: true
+  #cephcsi:
+    #image: quay.io/cephcsi/cephcsi:v1.2.0
+  #registrar:
+    #image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
+  #provisioner:
+    #image: quay.io/k8scsi/csi-provisioner:v1.3.0
+  #snapshotter:
+    #image: quay.io/k8scsi/csi-snapshotter:v1.2.0
+  #attacher:
+    #image: quay.io/k8scsi/csi-attacher:v1.2.0
+
+enableFlexDriver: true
 enableDiscoveryDaemon: true
 
 ## Rook Agent configuration