From 0d6bba587ae415a9a28dd8aa241d620ea34d241e Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 23 Jan 2020 13:59:53 +0530 Subject: [PATCH] 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 (cherry picked from commit eb2fb9233be1871cff43a5eba3b332b1e5e64560) --- charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml | 5 +++++ charts/ceph-csi-cephfs/templates/nodeplugin-psp.yaml | 2 ++ charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml | 5 +++++ charts/ceph-csi-rbd/templates/nodeplugin-psp.yaml | 2 ++ deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 5 +++++ deploy/cephfs/kubernetes/csi-nodeplugin-psp.yaml | 2 ++ deploy/rbd/kubernetes/csi-nodeplugin-psp.yaml | 2 ++ deploy/rbd/kubernetes/csi-rbdplugin.yaml | 5 +++++ 8 files changed, 28 insertions(+) diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index 03f1a0a2f..57b945a06 100644 --- 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 index 5321d17e0..5a03dbecd 100644 --- 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 index 2567bba66..51a894be4 100644 --- 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: /run/mount name: host-mount @@ -177,6 +179,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 index 8678c8bc9..8374a9fac 100644 --- 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 index 3bb7baeac..015219425 100644 --- 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 index 781465b4f..181925711 100644 --- 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 index f260db3f5..31e62ab7f 100644 --- 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 index 0ad687eb6..f73daf40b 100644 --- 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