fix prestop in juicefs-plugin. mv reg.sock prestop in node-driver-reg…

…istar container (#397)
juicedata · Aug 24, 2022 · 2d1ea65 · 2d1ea65
1 parent 96ca368
commit 2d1ea65
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/deploy/k8s.yaml b/deploy/k8s.yaml
@@ -413,7 +413,7 @@ spec:
               command:
               - /bin/sh
               - -c
-              - rm /registration/csi.juicefs.com-reg.sock /csi/csi.sock
+              - rm /csi/csi.sock
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -450,8 +450,6 @@ spec:
         - mountPath: /root/.juicefs
           mountPropagation: Bidirectional
           name: jfs-root-dir
-        - mountPath: /registration
-          name: registration-dir
       - args:
         - --csi-address=$(ADDRESS)
         - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
@@ -462,6 +460,13 @@ spec:
         - name: DRIVER_REG_SOCK_PATH
           value: /var/lib/kubelet/csi-plugins/csi.juicefs.com/csi.sock
         image: quay.io/k8scsi/csi-node-driver-registrar:v1.3.0
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - /bin/sh
+              - -c
+              - rm /registration/csi.juicefs.com-reg.sock
         name: node-driver-registrar
         volumeMounts:
         - mountPath: /csi

diff --git a/deploy/k8s_before_v1_18.yaml b/deploy/k8s_before_v1_18.yaml
@@ -413,7 +413,7 @@ spec:
               command:
               - /bin/sh
               - -c
-              - rm /registration/csi.juicefs.com-reg.sock /csi/csi.sock
+              - rm /csi/csi.sock
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -450,8 +450,6 @@ spec:
         - mountPath: /root/.juicefs
           mountPropagation: Bidirectional
           name: jfs-root-dir
-        - mountPath: /registration
-          name: registration-dir
       - args:
         - --csi-address=$(ADDRESS)
         - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
@@ -462,6 +460,13 @@ spec:
         - name: DRIVER_REG_SOCK_PATH
           value: /var/lib/kubelet/csi-plugins/csi.juicefs.com/csi.sock
         image: quay.io/k8scsi/csi-node-driver-registrar:v1.3.0
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - /bin/sh
+              - -c
+              - rm /registration/csi.juicefs.com-reg.sock
         name: node-driver-registrar
         volumeMounts:
         - mountPath: /csi

diff --git a/deploy/kubernetes/base/resources.yaml b/deploy/kubernetes/base/resources.yaml
@@ -377,15 +377,13 @@ spec:
             - mountPath: /root/.juicefs
               mountPropagation: Bidirectional
               name: jfs-root-dir
-            - name: registration-dir
-              mountPath: /registration
           lifecycle:
             preStop:
               exec:
                 command:
                   - /bin/sh
                   - -c
-                  - rm /registration/csi.juicefs.com-reg.sock /csi/csi.sock
+                  - rm /csi/csi.sock
           ports:
             - name: healthz
               containerPort: 9909
@@ -414,6 +412,13 @@ spec:
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - /bin/sh
+                  - -c
+                  - rm /registration/csi.juicefs.com-reg.sock
         - name: liveness-probe
           image: quay.io/k8scsi/livenessprobe:v1.1.0
           args: