From ac76531a7c771b708e9c8d5603bcde141dac1d69 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 13 Jan 2020 09:35:50 +0530 Subject: [PATCH] Use EmptyDir to store provisioner socket currently, we are making use of host path directory to store the provisioner socket, as this the socket is not needed by anyone else other than containers inside the provisioner pod using the empty directory to store this socket is the best option. Signed-off-by: Madhu Rajanna (cherry picked from commit fbda8cc4caf6ca818dc62a23d12d51c582cf8067) --- .../ceph-csi-cephfs/templates/provisioner-deployment.yaml | 6 +++--- .../ceph-csi-cephfs/templates/provisioner-statefulset.yaml | 6 +++--- charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 6 +++--- charts/ceph-csi-rbd/templates/provisioner-statefulset.yaml | 6 +++--- .../kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml | 6 +++--- .../kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml | 6 +++--- deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml | 6 +++--- deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index d69c9682b..01281475c 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -145,9 +145,9 @@ spec: {{- end }} volumes: - name: socket-dir - hostPath: - path: {{ .Values.socketDir }} - type: DirectoryOrCreate + emptyDir: { + medium: "Memory" + } - name: host-sys hostPath: path: /sys diff --git a/charts/ceph-csi-cephfs/templates/provisioner-statefulset.yaml b/charts/ceph-csi-cephfs/templates/provisioner-statefulset.yaml index 919e2284e..4400aaf24 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-statefulset.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-statefulset.yaml @@ -142,9 +142,9 @@ spec: {{- end }} volumes: - name: socket-dir - hostPath: - path: {{ .Values.socketDir }} - type: DirectoryOrCreate + emptyDir: { + medium: "Memory" + } - name: host-sys hostPath: path: /sys diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 706d037d9..53a585228 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -162,9 +162,9 @@ spec: {{- end }} volumes: - name: socket-dir - hostPath: - path: {{ .Values.socketDir }} - type: DirectoryOrCreate + emptyDir: { + medium: "Memory" + } - name: host-dev hostPath: path: /dev diff --git a/charts/ceph-csi-rbd/templates/provisioner-statefulset.yaml b/charts/ceph-csi-rbd/templates/provisioner-statefulset.yaml index 5fbbbfea9..3fbe69f35 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-statefulset.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-statefulset.yaml @@ -159,9 +159,9 @@ spec: {{- end }} volumes: - name: socket-dir - hostPath: - path: {{ .Values.socketDir }} - type: DirectoryOrCreate + emptyDir: { + medium: "Memory" + } - name: host-dev hostPath: path: /dev diff --git a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml index 203565803..0a45f7d83 100644 --- a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml @@ -133,9 +133,9 @@ spec: imagePullPolicy: "IfNotPresent" volumes: - name: socket-dir - hostPath: - path: /var/lib/kubelet/plugins/cephfs.csi.ceph.com - type: DirectoryOrCreate + emptyDir: { + medium: "Memory" + } - name: host-sys hostPath: path: /sys diff --git a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml index c831a196d..9e61f841e 100644 --- a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml @@ -136,9 +136,9 @@ spec: imagePullPolicy: "IfNotPresent" volumes: - name: socket-dir - hostPath: - path: /var/lib/kubelet/plugins/cephfs.csi.ceph.com - type: DirectoryOrCreate + emptyDir: { + medium: "Memory" + } - name: host-sys hostPath: path: /sys diff --git a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml index 25f8b0c50..19edcc170 100644 --- a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml @@ -156,9 +156,9 @@ spec: hostPath: path: /lib/modules - name: socket-dir - hostPath: - path: /var/lib/kubelet/plugins/rbd.csi.ceph.com - type: DirectoryOrCreate + emptyDir: { + medium: "Memory" + } - name: ceph-csi-config configMap: name: ceph-csi-config diff --git a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml index bdc3cebb0..ab41e4d8b 100644 --- a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml @@ -160,9 +160,9 @@ spec: hostPath: path: /lib/modules - name: socket-dir - hostPath: - path: /var/lib/kubelet/plugins/rbd.csi.ceph.com - type: DirectoryOrCreate + emptyDir: { + medium: "Memory" + } - name: ceph-csi-config configMap: name: ceph-csi-config