test: undo location change

Author: olevski

deploy/csi-rclone/templates/csi-controller-rclone.yaml

@@ -54,8 +54,8 @@ spec:
         image: {{ .Values.csiControllerRclone.csiProvisioner.image.repository }}:{{ .Values.csiControllerRclone.csiProvisioner.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.csiControllerRclone.csiProvisioner.imagePullPolicy }}
         volumeMounts:
-          - mountPath: /csi
-            name: socket-dir
+          - name: socket-dir
+            mountPath: /csi
       - name: rclone
         args:
         - run
@@ -85,7 +85,7 @@ spec:
             fieldRef:
               fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
-          value: "unix://csi/csi.sock"
+          value: "unix://plugin/csi.sock"
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ quote .Values.kubernetesClusterDomain }}
         {{- if .Values.csiControllerRclone.rclone.goMemLimit }}
@@ -114,7 +114,7 @@ spec:
           timeoutSeconds: 3
           periodSeconds: 2
         volumeMounts:
-        - mountPath: /csi
+        - mountPath: /plugin
           name: socket-dir
       - name: liveness-probe
         imagePullPolicy: Always

deploy/csi-rclone/templates/csi-nodeplugin-rclone.yaml

@@ -22,7 +22,7 @@ spec:
       - name: node-driver-registrar
         args:
         - --v=5
-        - --csi-address=/csi/csi.sock
+        - --csi-address=/plugin/csi.sock
         - --kubelet-registration-path=/var/lib/kubelet/plugins/{{ .Values.storageClassName }}/csi.sock
         env:
         - name: KUBE_NODE_NAME
@@ -45,17 +45,17 @@ spec:
         resources:
           {{- toYaml .Values.csiNodepluginRclone.rclone.resources | nindent 12 }}
         volumeMounts:
-        - mountPath: /csi
+        - mountPath: /plugin
           name: plugin-dir
         - mountPath: /registration
           name: registration-dir
       - name: liveness-probe
         imagePullPolicy: Always
         image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
         args:
-        - --csi-address=/csi/csi.sock
+        - --csi-address=/plugin/csi.sock
         volumeMounts:
-        - mountPath: /csi
+        - mountPath: /plugin
           name: plugin-dir
       - name: rclone
         args:
@@ -86,7 +86,7 @@ spec:
             fieldRef:
               fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
-          value: "unix://csi/csi.sock"
+          value: "unix://plugin/csi.sock"
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ quote .Values.kubernetesClusterDomain }}
         - name: DRIVER_NAME
@@ -134,7 +134,7 @@ spec:
           timeoutSeconds: 10
           periodSeconds: 30
         volumeMounts:
-        - mountPath: /csi
+        - mountPath: /plugin
           name: plugin-dir
         - mountPath: /run/csi-rclone
           name: node-temp-dir