From 50a720f13dafc9c37e5fb596211d80abc634483f Mon Sep 17 00:00:00 2001 From: Matthias Neugebauer Date: Tue, 2 Feb 2021 13:05:30 +0100 Subject: [PATCH] helm: Fix plugin socket path PR #1736 made the kubelet path configurable. It also introduced a change in the path to the CSI socket. By default the path is now `/var/lib/kubelet/cephfs.csi.ceph.com/csi.sock` instead of `/var/lib/kubelet/plugins/cephfs.csi.ceph.com/csi.sock`. This PR restores the old default. Signed-off-by: Matthias Neugebauer --- charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml | 4 ++-- charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index c319e3425..f5fe54080 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -43,7 +43,7 @@ spec: args: - "--v={{ .Values.logLevel }}" - "--csi-address=/csi/{{ .Values.pluginSocketFile }}" - - "--kubelet-registration-path={{ .Values.kubeletDir }}/{{ .Values.driverName }}/{{ .Values.pluginSocketFile }}" + - "--kubelet-registration-path={{ .Values.kubeletDir }}/plugins/{{ .Values.driverName }}/{{ .Values.pluginSocketFile }}" env: - name: KUBE_NODE_NAME valueFrom: @@ -144,7 +144,7 @@ spec: volumes: - name: socket-dir hostPath: - path: "{{ .Values.kubeletDir }}/{{ .Values.driverName }}" + path: "{{ .Values.kubeletDir }}/plugins/{{ .Values.driverName }}" type: DirectoryOrCreate - name: registration-dir hostPath: diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml index b4f68b568..dcf1bea1b 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml @@ -44,7 +44,7 @@ spec: args: - "--v={{ .Values.logLevel }}" - "--csi-address=/csi/{{ .Values.pluginSocketFile }}" - - "--kubelet-registration-path={{ .Values.kubeletDir }}/{{ .Values.driverName }}/{{ .Values.pluginSocketFile }}" + - "--kubelet-registration-path={{ .Values.kubeletDir }}/plugins/{{ .Values.driverName }}/{{ .Values.pluginSocketFile }}" env: - name: KUBE_NODE_NAME valueFrom: @@ -144,7 +144,7 @@ spec: volumes: - name: socket-dir hostPath: - path: "{{ .Values.kubeletDir }}/{{ .Values.driverName }}" + path: "{{ .Values.kubeletDir }}/plugins/{{ .Values.driverName }}" type: DirectoryOrCreate - name: registration-dir hostPath: