Implement NodeStage and NodeUnstage for rbd

in NodeStage RPC call  we  have to map the
device to the node plugin and make  sure  the
the device will be mounted to  the global path

in  nodeUnstage request unmount the device from
global path and unmap the device

if the volume mode is block  we will be creating
a file inside a stageTargetPath  and it will be
considered  as the global path

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>

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

@@ -87,13 +87,13 @@ spec:
           volumeMounts:
             - name: mount-cache-dir
               mountPath: /mount-cache-dir
-            - name: plugin-dir
+            - name: socket-dir
               mountPath: {{ .Values.socketDir }}
-            - name: pods-mount-dir
-              mountPath: /var/lib/kubelet/pods
+            - name: plugin-dir
+              mountPath: {{ .Values.pluginDir }}
               mountPropagation: "Bidirectional"
-            - name: plugin-mount-dir
-              mountPath: {{ .Values.volumeDevicesDir }}
+            - name: mointpoint-dir
+              mountPath: /var/lib/kubelet/pods
               mountPropagation: "Bidirectional"
             - mountPath: /dev
               name: host-dev
@@ -111,22 +111,22 @@ spec:
       volumes:
         - name: mount-cache-dir
           emptyDir: {}
-        - name: plugin-dir
+        - name: socket-dir
           hostPath:
             path: {{ .Values.socketDir }}
             type: DirectoryOrCreate
-        - name: plugin-mount-dir
-          hostPath:
-            path: {{ .Values.volumeDevicesDir }}
-            type: DirectoryOrCreate
         - name: registration-dir
           hostPath:
             path: {{ .Values.registrationDir }}
             type: Directory
-        - name: pods-mount-dir
+        - name: plugin-dir
+          hostPath:
+            path: {{ .Values.pluginDir }}
+            type: Directory
+        - name: mountpoint-dir
           hostPath:
             path: /var/lib/kubelet/pods
-            type: Directory
+            type: DirectoryOrCreate
         - name: host-dev
           hostPath:
             path: /dev

deploy/cephfs/helm/values.yaml

@@ -16,7 +16,7 @@ serviceAccounts:
 socketDir: /var/lib/kubelet/plugins/cephfs.csi.ceph.com
 socketFile: csi.sock
 registrationDir: /var/lib/kubelet/plugins_registry
-volumeDevicesDir: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices
+pluginDir: /var/lib/kubelet/plugins
 driverName: cephfs.csi.ceph.com
 configMapName: ceph-csi-config
 attacher:

deploy/cephfs/kubernetes/csi-cephfsplugin.yaml

@@ -38,7 +38,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
           volumeMounts:
-            - name: plugin-dir
+            - name: socket-dir
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
@@ -73,13 +73,13 @@ spec:
           volumeMounts:
             - name: mount-cache-dir
               mountPath: /mount-cache-dir
-            - name: plugin-dir
+            - name: socket-dir
               mountPath: /csi
-            - name: csi-plugins-dir
-              mountPath: /var/lib/kubelet/plugins/kubernetes.io/csi
-              mountPropagation: "Bidirectional"
-            - name: pods-mount-dir
+            - name: mountpoint-dir
               mountPath: /var/lib/kubelet/pods
+              mountPropagation: Bidirectional
+            - name: plugin-dir
+              mountPath: /var/lib/kubelet/plugins
               mountPropagation: "Bidirectional"
             - name: host-sys
               mountPath: /sys
@@ -93,21 +93,21 @@ spec:
       volumes:
         - name: mount-cache-dir
           emptyDir: {}
-        - name: plugin-dir
+        - name: socket-dir
           hostPath:
             path: /var/lib/kubelet/plugins/cephfs.csi.ceph.com/
             type: DirectoryOrCreate
-        - name: csi-plugins-dir
-          hostPath:
-            path: /var/lib/kubelet/plugins/kubernetes.io/csi
-            type: DirectoryOrCreate
         - name: registration-dir
           hostPath:
             path: /var/lib/kubelet/plugins_registry/
             type: Directory
-        - name: pods-mount-dir
+        - name: mountpoint-dir
           hostPath:
             path: /var/lib/kubelet/pods
+            type: DirectoryOrCreate
+        - name: plugin-dir
+          hostPath:
+            path: /var/lib/kubelet/plugins
             type: Directory
         - name: host-sys
           hostPath:

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

@@ -14,6 +14,8 @@ spec:
       app: {{ include "ceph-csi-rbd.name" . }}
       component: {{ .Values.nodeplugin.name }}
       release: {{ .Release.Name }}
+  updateStrategy:
+    type: OnDelete
   template:
     metadata:
       labels:
@@ -51,7 +53,7 @@ spec:
                   fieldPath: spec.nodeName
           imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }}
           volumeMounts:
-            - name: plugin-dir
+            - name: socket-dir
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
@@ -84,13 +86,13 @@ spec:
               value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}"
           imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           volumeMounts:
-            - name: plugin-dir
+            - name: socket-dir
               mountPath: {{ .Values.socketDir }}
-            - name: pods-mount-dir
-              mountPath: /var/lib/kubelet/pods
+            - name: plugin-dir
+              mountPath: {{ .Values.pluginDir }}
               mountPropagation: "Bidirectional"
-            - name: plugin-mount-dir
-              mountPath: {{ .Values.volumeDevicesDir }}
+            - name: mointpoint-dir
+              mountPath: /var/lib/kubelet/pods
               mountPropagation: "Bidirectional"
             - mountPath: /dev
               name: host-dev
@@ -106,22 +108,22 @@ spec:
           resources:
 {{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }}
       volumes:
-        - name: plugin-dir
+        - name: socket-dir
           hostPath:
             path: {{ .Values.socketDir }}
             type: DirectoryOrCreate
-        - name: plugin-mount-dir
-          hostPath:
-            path: {{ .Values.volumeDevicesDir }}
-            type: DirectoryOrCreate
         - name: registration-dir
           hostPath:
             path: {{ .Values.registrationDir }}
             type: Directory
-        - name: pods-mount-dir
+        - name: plugin-dir
+          hostPath:
+            path: {{ .Values.pluginDir }}
+            type: Directory
+        - name: mountpoint-dir
           hostPath:
             path: /var/lib/kubelet/pods
-            type: Directory
+            type: DirectoryOrCreate
         - name: host-dev
           hostPath:
             path: /dev

deploy/rbd/helm/values.yaml

@@ -16,7 +16,7 @@ serviceAccounts:
 socketDir: /var/lib/kubelet/plugins/rbd.csi.ceph.com
 socketFile: csi.sock
 registrationDir: /var/lib/kubelet/plugins_registry
-volumeDevicesDir: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices
+pluginDir: /var/lib/kubelet/plugins
 driverName: rbd.csi.ceph.com
 configMapName: ceph-csi-config
 

deploy/rbd/kubernetes/csi-rbdplugin.yaml

@@ -7,6 +7,8 @@ spec:
   selector:
     matchLabels:
       app: csi-rbdplugin
+  updateStrategy:
+    type: OnDelete
   template:
     metadata:
       labels:
@@ -39,7 +41,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
           volumeMounts:
-            - name: plugin-dir
+            - name: socket-dir
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
@@ -69,14 +71,8 @@ spec:
               value: unix:///csi/csi.sock
           imagePullPolicy: "IfNotPresent"
           volumeMounts:
-            - name: plugin-dir
+            - name: socket-dir
               mountPath: /csi
-            - name: pods-mount-dir
-              mountPath: /var/lib/kubelet/pods
-              mountPropagation: "Bidirectional"
-            - name: plugin-mount-dir
-              mountPath: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices/
-              mountPropagation: "Bidirectional"
             - mountPath: /dev
               name: host-dev
             - mountPath: /rootfs
@@ -88,23 +84,29 @@ spec:
               readOnly: true
             - name: ceph-csi-config
               mountPath: /etc/ceph-csi-config/
+            - name: plugin-dir
+              mountPath: /var/lib/kubelet/plugins
+              mountPropagation: "Bidirectional"
+            - name: mountpoint-dir
+              mountPath: /var/lib/kubelet/pods
+              mountPropagation: "Bidirectional"
       volumes:
-        - name: plugin-dir
+        - name: socket-dir
           hostPath:
             path: /var/lib/kubelet/plugins/rbd.csi.ceph.com
             type: DirectoryOrCreate
-        - name: plugin-mount-dir
+        - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices/
+            path: /var/lib/kubelet/plugins
+            type: Directory
+        - name: mountpoint-dir
+          hostPath:
+            path: /var/lib/kubelet/pods
             type: DirectoryOrCreate
         - name: registration-dir
           hostPath:
             path: /var/lib/kubelet/plugins_registry/
             type: Directory
-        - name: pods-mount-dir
-          hostPath:
-            path: /var/lib/kubelet/pods
-            type: Directory
         - name: host-dev
           hostPath:
             path: /dev