From 52397b4dc4d6f5b45b7d0351401d445036d3ad01 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 18 Mar 2019 12:20:06 +0530 Subject: [PATCH] rename socket directory to a common name as the socket directory will be created inside the container no need to follow the plugin name in for the directory creation, this will also reduce the code changes if we want to change driver name. Signed-off-by: Madhu Rajanna --- .../kubernetes/csi-cephfsplugin-provisioner.yaml | 8 ++++---- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 4 ++-- deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml | 4 ++-- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 12 ++++++------ deploy/rbd/kubernetes/csi-rbdplugin.yaml | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 8d515aacc..af5962933 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -34,11 +34,11 @@ spec: - "--v=5" env: - name: ADDRESS - value: /var/lib/kubelet/plugins/cephfs.csi.ceph.com/csi-provisioner.sock + value: unix:///csi/csi-provisioner.sock imagePullPolicy: "IfNotPresent" volumeMounts: - name: socket-dir - mountPath: /var/lib/kubelet/plugins/cephfs.csi.ceph.com + mountPath: /csi - name: csi-cephfsplugin securityContext: privileged: true @@ -61,11 +61,11 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CSI_ENDPOINT - value: unix://var/lib/kubelet/plugins/cephfs.csi.ceph.com/csi-provisioner.sock + value: unix:///csi/csi-provisioner.sock imagePullPolicy: "IfNotPresent" volumeMounts: - name: socket-dir - mountPath: /var/lib/kubelet/plugins/cephfs.csi.ceph.com + mountPath: /csi - name: host-sys mountPath: /sys - name: lib-modules diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 0452efa3d..af4322fee 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -65,11 +65,11 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CSI_ENDPOINT - value: unix://var/lib/kubelet/plugins/cephfs.csi.ceph.com/csi.sock + value: unix:///csi/csi.sock imagePullPolicy: "IfNotPresent" volumeMounts: - name: plugin-dir - mountPath: /var/lib/kubelet/plugins/cephfs.csi.ceph.com + mountPath: /csi - name: csi-plugins-dir mountPath: /var/lib/kubelet/plugins/kubernetes.io/csi mountPropagation: "Bidirectional" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml index a328f105f..81029b733 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml @@ -34,11 +34,11 @@ spec: - "--csi-address=$(ADDRESS)" env: - name: ADDRESS - value: /var/lib/kubelet/plugins/rbd.csi.ceph.com/csi.sock + value: unix:///csi/csi-attacher.sock imagePullPolicy: "IfNotPresent" volumeMounts: - name: socket-dir - mountPath: /var/lib/kubelet/plugins/rbd.csi.ceph.com + mountPath: /csi volumes: - name: socket-dir hostPath: diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 61ab47495..aef25c04c 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -34,11 +34,11 @@ spec: - "--v=5" env: - name: ADDRESS - value: /var/lib/kubelet/plugins/rbd.csi.ceph.com/csi-provisioner.sock + value: unix:///csi/csi-provisioner.sock imagePullPolicy: "IfNotPresent" volumeMounts: - name: socket-dir - mountPath: /var/lib/kubelet/plugins/rbd.csi.ceph.com + mountPath: /csi - name: csi-snapshotter image: quay.io/k8scsi/csi-snapshotter:v1.0.1 args: @@ -47,13 +47,13 @@ spec: - "--v=5" env: - name: ADDRESS - value: /var/lib/kubelet/plugins/rbd.csi.ceph.com/csi-provisioner.sock + value: unix:///csi/csi-provisioner.sock imagePullPolicy: Always securityContext: privileged: true volumeMounts: - name: socket-dir - mountPath: /var/lib/kubelet/plugins/rbd.csi.ceph.com + mountPath: /csi - name: csi-rbdplugin securityContext: privileged: true @@ -79,11 +79,11 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CSI_ENDPOINT - value: unix://var/lib/kubelet/plugins/rbd.csi.ceph.com/csi-provisioner.sock + value: unix:///csi/csi-provisioner.sock imagePullPolicy: "IfNotPresent" volumeMounts: - name: socket-dir - mountPath: /var/lib/kubelet/plugins/rbd.csi.ceph.com + mountPath: /csi - mountPath: /dev name: host-dev - mountPath: /rootfs diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index dbe7539bc..22fe06f3f 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -69,11 +69,11 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CSI_ENDPOINT - value: unix://var/lib/kubelet/plugins_registry/rbd.csi.ceph.com/csi.sock + value: unix:///csi/csi.sock imagePullPolicy: "IfNotPresent" volumeMounts: - name: plugin-dir - mountPath: /var/lib/kubelet/plugins_registry/rbd.csi.ceph.com + mountPath: /csi - name: pods-mount-dir mountPath: /var/lib/kubelet/pods mountPropagation: "Bidirectional"