Add run hostpath to daemonset pods

`/run/mount` need to be share between host and csi-plugin containers for `/run/mount/utab` this is required to ensures that the network is not stopped prior to unmounting the network devices. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
ceph · Jan 24, 2020 · ea45337 · ea45337
1 parent 1b52e06
commit ea45337
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 0 deletions.
diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml
@@ -121,6 +121,8 @@ spec:
               mountPropagation: "Bidirectional"
             - mountPath: /dev
               name: host-dev
+            - mountPath: /run/mount
+              name: host-mount
             - mountPath: /sys
               name: host-sys
             - mountPath: /lib/modules
@@ -180,6 +182,9 @@ spec:
         - name: host-sys
           hostPath:
             path: /sys
+        - name: host-mount
+          hostPath:
+            path: /run/mount
         - name: lib-modules
           hostPath:
             path: /lib/modules

diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-psp.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-psp.yaml
@@ -34,6 +34,8 @@ spec:
   allowedHostPaths:
     - pathPrefix: '/dev'
       readOnly: false
+    - pathPrefix: '/run/mount'
+      readOnly: false
     - pathPrefix: '/sys'
       readOnly: false
     - pathPrefix: '/lib/modules'

diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
@@ -111,6 +111,8 @@ spec:
             - name: socket-dir
               mountPath: /csi
             - mountPath: /dev
+              name: host-mount
+            - mountPath: /run/mount
               name: host-dev
             - mountPath: /sys
               name: host-sys
@@ -175,6 +177,9 @@ spec:
         - name: host-dev
           hostPath:
             path: /dev
+        - name: host-mount
+          hostPath:
+            path: /run/mount
         - name: host-sys
           hostPath:
             path: /sys

diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-psp.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-psp.yaml
@@ -34,6 +34,8 @@ spec:
   allowedHostPaths:
     - pathPrefix: '/dev'
       readOnly: false
+    - pathPrefix: '/run/mount'
+      readOnly: false
     - pathPrefix: '/sys'
       readOnly: false
     - pathPrefix: '/lib/modules'

diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
@@ -101,6 +101,8 @@ spec:
               readOnly: true
             - name: host-dev
               mountPath: /dev
+            - name: host-mount
+              mountPath: /run/mount
             - name: ceph-csi-config
               mountPath: /etc/ceph-csi-config/
             - name: keys-tmp-dir
@@ -155,6 +157,9 @@ spec:
         - name: host-dev
           hostPath:
             path: /dev
+        - name: host-mount
+          hostPath:
+            path: /run/mount
         - name: ceph-csi-config
           configMap:
             name: ceph-csi-config

diff --git a/deploy/cephfs/kubernetes/csi-nodeplugin-psp.yaml b/deploy/cephfs/kubernetes/csi-nodeplugin-psp.yaml
@@ -28,6 +28,8 @@ spec:
   allowedHostPaths:
     - pathPrefix: '/dev'
       readOnly: false
+    - pathPrefix: '/run/mount'
+      readOnly: false
     - pathPrefix: '/sys'
       readOnly: false
     - pathPrefix: '/lib/modules'

diff --git a/deploy/rbd/kubernetes/csi-nodeplugin-psp.yaml b/deploy/rbd/kubernetes/csi-nodeplugin-psp.yaml
@@ -28,6 +28,8 @@ spec:
   allowedHostPaths:
     - pathPrefix: '/dev'
       readOnly: false
+    - pathPrefix: '/run/mount'
+      readOnly: false
     - pathPrefix: '/sys'
       readOnly: false
     - pathPrefix: '/lib/modules'

diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
@@ -89,6 +89,8 @@ spec:
               name: host-dev
             - mountPath: /sys
               name: host-sys
+            - mountPath: /run/mount
+              name: host-mount
             - mountPath: /lib/modules
               name: lib-modules
               readOnly: true
@@ -147,6 +149,9 @@ spec:
         - name: host-sys
           hostPath:
             path: /sys
+        - name: host-mount
+          hostPath:
+            path: /run/mount
         - name: lib-modules
           hostPath:
             path: /lib/modules