Merge pull request #2259 from hajiler/kubelet-directory-mount

Replace kubelet volume mount  with subdirectories

Author: k8s-ci-robot

deploy/kubernetes/base/node_linux/node.yaml

@@ -56,8 +56,11 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
           volumeMounts:
-            - name: kubelet-dir
-              mountPath: /var/lib/kubelet
+            - name:  kubelet-plugin-dir
+              mountPath: /var/lib/kubelet/plugins/kubernetes.io/csi
+              mountPropagation: "Bidirectional"
+            - name: kubelet-pods
+              mountPath: /var/lib/kubelet/pods
               mountPropagation: "Bidirectional"
             - name: plugin-dir
               mountPath: /csi
@@ -81,10 +84,13 @@ spec:
           hostPath:
             path: /var/lib/kubelet/plugins_registry/
             type: Directory
-        - name: kubelet-dir
+        - name: kubelet-pods
           hostPath:
-            path: /var/lib/kubelet
-            type: Directory
+            path: /var/lib/kubelet/pods
+        - name: kubelet-plugin-dir
+          hostPath:
+            path: /var/lib/kubelet/plugins/kubernetes.io/csi
+            type: DirectoryOrCreate
         - name: plugin-dir
           hostPath:
             path: /var/lib/kubelet/plugins/pd.csi.storage.gke.io/

deploy/kubernetes/base/node_windows/node.yaml

@@ -50,8 +50,11 @@ spec:
           command:
             - /gce-pd-csi-driver
           volumeMounts:
-            - name: kubelet-dir
-              mountPath: C:\var\lib\kubelet
+            - name: kubelet-plugin-dir
+              mountPath: C:\var\lib\kubelet\plugins\kubernetes.io\csi
+              mountPropagation: "None"
+            - name: kubelet-pods
+              mountPath: C:\var\lib\kubelet\pods
               mountPropagation: "None"
             - name: plugin-dir
               mountPath: C:\csi
@@ -100,10 +103,13 @@ spec:
         hostPath:
           path: \var\lib\kubelet\plugins_registry
           type: Directory
-      - name: kubelet-dir
+      - name: kubelet-pods
         hostPath:
-          path: \var\lib\kubelet
-          type: Directory
+          path: \var\lib\kubelet\pods
+      - name: kubelet-plugin-dir
+        hostPath:
+          path: \var\lib\kubelet\plugins\kubernetes.io\csi
+          type: DirectoryOrCreate
       - name: plugin-dir
         hostPath:
           path: \var\lib\kubelet\plugins\pd.csi.storage.gke.io