mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 08:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

helm: Fix plugin socket path

Browse Source 
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 <matthias.neugebauer@uni-muenster.de>
This commit is contained in:
Matthias Neugebauer 2021-02-02 13:05:30 +01:00 committed by mergify[bot]
parent 582d004ca5
commit 50a720f13d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml
View File

@ -43,7 +43,7 @@ spec:
args: args:
- "--v={{ .Values.logLevel }}" - "--v={{ .Values.logLevel }}"
- "--csi-address=/csi/{{ .Values.pluginSocketFile }}" - "--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: env:
- name: KUBE_NODE_NAME - name: KUBE_NODE_NAME
valueFrom: valueFrom:
@ -144,7 +144,7 @@ spec:
volumes: volumes:
- name: socket-dir - name: socket-dir
hostPath: hostPath:
path: "{{ .Values.kubeletDir }}/{{ .Values.driverName }}" path: "{{ .Values.kubeletDir }}/plugins/{{ .Values.driverName }}"
type: DirectoryOrCreate type: DirectoryOrCreate
- name: registration-dir - name: registration-dir
hostPath: hostPath:

4
charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
View File

@ -44,7 +44,7 @@ spec:
args: args:
- "--v={{ .Values.logLevel }}" - "--v={{ .Values.logLevel }}"
- "--csi-address=/csi/{{ .Values.pluginSocketFile }}" - "--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: env:
- name: KUBE_NODE_NAME - name: KUBE_NODE_NAME
valueFrom: valueFrom:
@ -144,7 +144,7 @@ spec:
volumes: volumes:
- name: socket-dir - name: socket-dir
hostPath: hostPath:
path: "{{ .Values.kubeletDir }}/{{ .Values.driverName }}" path: "{{ .Values.kubeletDir }}/plugins/{{ .Values.driverName }}"
type: DirectoryOrCreate type: DirectoryOrCreate
- name: registration-dir - name: registration-dir
hostPath: hostPath: