[cinder-csi-plugin] Remove preStop hook

Author: ramineni

charts/cinder-csi-plugin/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: latest
 description: Cinder CSI Chart for OpenStack
 name: openstack-cinder-csi
-version: 1.4.7
+version: 1.4.8
 home: https://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:

charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml

@@ -22,15 +22,11 @@ spec:
           args:
             - "--csi-address=$(ADDRESS)"
             - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
-          lifecycle:
-            preStop:
-              exec:
-                command: ["/bin/sh", "-c", "rm -rf /registration/cinder.csi.openstack.org /registration/cinder.csi.openstack.org-reg.sock"]
           env:
             - name: ADDRESS
               value: /csi/csi.sock
             - name: DRIVER_REG_SOCK_PATH
-              value: {{ .Values.csi.nodePlugin.kubeletDir }}/plugins/cinder.csi.openstack.org/csi.sock
+              value: {{ .Values.csi.plugin.nodePlugin.kubeletDir }}/plugins/cinder.csi.openstack.org/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -84,7 +80,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
             - name: kubelet-dir
-              mountPath: {{ .Values.csi.nodePlugin.kubeletDir }}
+              mountPath: {{ .Values.csi.plugin.nodePlugin.kubeletDir }}
               mountPropagation: "Bidirectional"
             - name: pods-probe-dir
               mountPath: /dev
@@ -94,15 +90,15 @@ spec:
       volumes:
         - name: socket-dir
           hostPath:
-            path: {{ .Values.csi.nodePlugin.kubeletDir }}/plugins/cinder.csi.openstack.org
+            path: {{ .Values.csi.plugin.nodePlugin.kubeletDir }}/plugins/cinder.csi.openstack.org
             type: DirectoryOrCreate
         - name: registration-dir
           hostPath:
-            path: {{ .Values.csi.nodePlugin.kubeletDir }}/plugins_registry/
+            path: {{ .Values.csi.plugin.nodePlugin.kubeletDir }}/plugins_registry/
             type: Directory
         - name: kubelet-dir
           hostPath:
-            path: {{ .Values.csi.nodePlugin.kubeletDir }}
+            path: {{ .Values.csi.plugin.nodePlugin.kubeletDir }}
             type: Directory
         # - name: pods-cloud-data
         #   hostPath:

manifests/cinder-csi-plugin/cinder-csi-nodeplugin.yaml

@@ -25,10 +25,6 @@ spec:
           args:
             - "--csi-address=$(ADDRESS)"
             - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
-          lifecycle:
-            preStop:
-              exec:
-                command: ["/bin/sh", "-c", "rm -rf /registration/cinder.csi.openstack.org /registration/cinder.csi.openstack.org-reg.sock"]
           env:
             - name: ADDRESS
               value: /csi/csi.sock