From 7e59c0ed78651f8278a7b81f7d1e0385cc631385 Mon Sep 17 00:00:00 2001
From: Humble Chirammal <hchiramm@redhat.com>
Date: Wed, 27 Nov 2019 17:45:27 +0530
Subject: [PATCH] Change deployment artifacts for RBD resizer

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
---
 .../templates/provisioner-deployment.yaml      | 18 ++++++++++++++++++
 .../provisioner-rules-clusterrole.yaml         |  7 ++++++-
 charts/ceph-csi-rbd/values.yaml                |  9 +++++++++
 .../v1.14+/csi-provisioner-rbac.yaml           |  5 ++++-
 .../v1.14+/csi-rbdplugin-provisioner.yaml      | 14 ++++++++++++++
 5 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
index 2554fb908..ed4755c63 100644
--- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
@@ -46,6 +46,24 @@ spec:
               mountPath: /csi
           resources:
 {{ toYaml .Values.provisioner.provisioner.resources | indent 12 }}
+{{- if .Values.provisioner.resizer.enabled }}
+        - name: csi-resizer
+          image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}"
+          imagePullPolicy: {{ .Values.provisioner.resizer.image.pullPolicy }}
+          args:
+            - "--v=5"
+            - "--csi-address=$(ADDRESS)"
+            - "--csiTimeout={{ .Values.provisioner.timeout }}"
+            - "--leader-election"
+          env:
+            - name: ADDRESS
+              value: "unix:///csi/{{ .Values.provisionerSocketFile }}"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+          resources:
+{{ toYaml .Values.provisioner.resizer.resources | indent 12 }}
+{{- end }}
         - name: csi-snapshotter
           image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }}
           imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }}
diff --git a/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml b/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml
index 94738a8df..244784b5e 100644
--- a/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml
+++ b/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml
@@ -19,7 +19,7 @@ rules:
     verbs: ["get", "list"]
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "update", "delete"]
+    verbs: ["get", "list", "watch", "create", "update", "delete", "patch"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]
@@ -60,5 +60,10 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshots/status"]
     verbs: ["update"]
+  {{- if .Values.provisioner.resizer.enabled }}
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims/status"]
+    verbs: ["update", "patch"]
+{{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
index 582745da9..64727cb93 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -198,6 +198,15 @@ provisioner:
       pullPolicy: IfNotPresent
     resources: {}
 
+  resizer:
+    name: resizer
+    enabled: true
+    image:
+      repository: quay.io/k8scsi/csi-resizer
+      tag: v0.3.0
+      pullPolicy: IfNotPresent
+    resources: {}
+
   snapshotter:
     image:
       repository: quay.io/k8scsi/csi-snapshotter
diff --git a/deploy/rbd/kubernetes/v1.14+/csi-provisioner-rbac.yaml b/deploy/rbd/kubernetes/v1.14+/csi-provisioner-rbac.yaml
index 3054998b4..22313c608 100644
--- a/deploy/rbd/kubernetes/v1.14+/csi-provisioner-rbac.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/csi-provisioner-rbac.yaml
@@ -33,7 +33,7 @@ rules:
     verbs: ["list", "watch", "create", "update", "patch"]
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "update", "delete"]
+    verbs: ["get", "list", "watch", "create", "update", "delete", "patch"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]
@@ -61,6 +61,9 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshots/status"]
     verbs: ["update"]
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims/status"]
+    verbs: ["update", "patch"]
 
 ---
 kind: ClusterRoleBinding
diff --git a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml
index 3b09a7ea8..49af85215 100644
--- a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml
@@ -85,6 +85,20 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
+        - name: csi-resizer
+          image: quay.io/k8scsi/csi-resizer:v0.3.0
+          args:
+            - "--csi-address=$(ADDRESS)"
+            - "--v=5"
+            - "--csiTimeout=150s"
+            - "--leader-election"
+          env:
+            - name: ADDRESS
+              value: unix:///csi/csi-provisioner.sock
+          imagePullPolicy: "IfNotPresent"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
         - name: csi-rbdplugin
           securityContext:
             privileged: true