Update helm chart to match static files

This updates the helm chart to match all the changes that have
been made to the static manifest files.

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

deploy/rbd/helm/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0.0"
 description: Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph RBD
 name: ceph-csi-rbd
-version: 0.2.0
+version: 0.3.0
 keywords:
 - ceph
 - rbd

deploy/rbd/helm/templates/nodeplugin-clusterrole.yaml

@@ -22,4 +22,7 @@ rules:
   - apiGroups: ["storage.k8s.io"]
     resources: ["volumeattachments"]
     verbs: ["get", "list", "watch", "update"]
+  - apiGroups: [""]
+    resources: ["configmaps"]
+    verbs: ["get", "list"]
 {{- end -}}

deploy/rbd/helm/templates/nodeplugin-daemonset.yaml

@@ -34,21 +34,21 @@ spec:
           image: "{{ .Values.nodeplugin.registrar.image.repository }}:{{ .Values.nodeplugin.registrar.image.tag }}"
           args:
             - "--v=5"
-            - "--csi-address=$(ADDRESS)"
+            - "--csi-address=/csi/{{ .Values.socketFile }}"
-            - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
+            - "--kubelet-registration-path={{ .Values.socketDir }}/{{ .Values.socketFile }}"
+          lifecycle:
+            preStop:
+              exec:
+                  command: ["/bin/sh", "-c", "rm -rf /registration/csi-rbdplugin /registration/csi-rbdplugin-reg.sock"]          
           env:
-            - name: ADDRESS
-              value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"
-            - name: DRIVER_REG_SOCK_PATH
-              value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
           imagePullPolicy: {{ .Values.nodeplugin.registrar.image.imagePullPolicy }}
           volumeMounts:
-            - name: socket-dir
+            - name: plugin-dir
-              mountPath: {{ .Values.socketDir }}
+              mountPath: /csi
             - name: registration-dir
               mountPath: /registration
           resources:
@@ -114,10 +114,6 @@ spec:
           hostPath:
             path: /var/lib/kubelet/pods
             type: Directory
-        - name: socket-dir
-          hostPath:
-            path: {{ .Values.socketDir }}
-            type: DirectoryOrCreate
         - name: host-dev
           hostPath:
             path: /dev

deploy/rbd/helm/templates/provisioner-clusterrole.yaml

@@ -28,4 +28,19 @@ rules:
   - apiGroups: [""]
     resources: ["endpoints"]
     verbs: ["get", "create", "update"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots"]
+    verbs: ["get", "list", "watch", "update"]
+  - apiGroups: [""]
+    resources: ["configmaps"]
+    verbs: ["get", "list", "create", "delete"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshotcontents"]
+    verbs: ["create", "get", "list", "watch", "update", "delete"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshotclasses"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["apiextensions.k8s.io"]
+    resources: ["customresourcedefinitions"]
+    verbs: ["create"]
 {{- end -}}

deploy/rbd/helm/templates/provisioner-statefulset.yaml

@@ -41,6 +41,23 @@ spec:
               mountPath: {{ .Values.socketDir }}
           resources:
 {{ toYaml .Values.provisioner.resources | indent 12 }}
+        - name: csi-snapshotter
+          image: {{ .Values.snapshotter.image.repository }}:{{ .Values.snapshotter.image.tag }}
+          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }}
+          args:
+            - "--csi-address=$(ADDRESS)"
+            - "--connection-timeout=15s"
+            - "--v=5"
+          env:
+            - name: ADDRESS
+              value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - name: socket-dir
+              mountPath: {{ .Values.socketDir }}
+          resources:
+{{ toYaml .Values.snapshotter.resources | indent 12 }}
         - name: csi-rbdplugin
           securityContext:
             privileged: true

deploy/rbd/helm/values.yaml

@@ -12,7 +12,7 @@ serviceAccounts:
     create: true
     name:
 
-socketDir: /var/lib/kubelet/plugins_registry/csi-rbdplugin
+socketDir: /var/lib/kubelet/plugins/csi-rbdplugin
 socketFile: csi.sock
 registrationDir: /var/lib/kubelet/plugins_registry
 volumeDevicesDir: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices
@@ -24,7 +24,7 @@ attacher:
 
   image:
     repository: quay.io/k8scsi/csi-attacher
-    tag: v1.0.0
+    tag: v1.0.1
     pullPolicy: IfNotPresent
 
   resources: {}
@@ -40,8 +40,8 @@ nodeplugin:
 
   registrar:
     image:
-      repository: quay.io/k8scsi/driver-registrar
+      repository: quay.io/k8scsi/csi-node-driver-registrar
-      tag: canary
+      tag: v1.0.2
       pullPolicy: IfNotPresent
     
     resources: {}
@@ -67,7 +67,7 @@ provisioner:
 
   image:
     repository: quay.io/k8scsi/csi-provisioner
-    tag: canary
+    tag: v1.0.1
     pullPolicy: IfNotPresent
 
   resources: {}
@@ -77,3 +77,11 @@ provisioner:
   tolerations: []
 
   affinity: {}
+
+snapshotter:
+  image:
+    repository: quay.io/k8scsi/csi-snapshotter
+    tag: v1.0.1
+    pullPolicy: IfNotPresent
+
+  resources: {}