diff --git a/charts/README.md b/charts/README.md index 798832551..6ed4022c3 100644 --- a/charts/README.md +++ b/charts/README.md @@ -40,6 +40,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `driver.mountPermissions` | mounted folder permissions name | `0777` | `feature.enableFSGroupPolicy` | enable `fsGroupPolicy` on a k8s 1.20+ cluster | `true` | | `feature.enableInlineVolume` | enable inline volume | `false` | +| `kubeletDir` | alternative kubelet directory | `/var/lib/kubelet` | | `image.nfs.repository` | csi-driver-nfs image | `mcr.microsoft.com/k8s/csi/nfs-csi` | | `image.nfs.tag` | csi-driver-nfs image tag | `latest` | | `image.nfs.pullPolicy` | csi-driver-nfs image pull policy | `IfNotPresent` | diff --git a/charts/latest/csi-driver-nfs-v3.2.0.tgz b/charts/latest/csi-driver-nfs-v3.2.0.tgz index 5c390a902..97c836bc4 100644 Binary files a/charts/latest/csi-driver-nfs-v3.2.0.tgz and b/charts/latest/csi-driver-nfs-v3.2.0.tgz differ diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml index c2b9991b4..245850269 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml @@ -95,7 +95,7 @@ spec: periodSeconds: 30 volumeMounts: - name: pods-mount-dir - mountPath: /var/lib/kubelet/pods + mountPath: {{ .Values.kubeletDir }}/pods mountPropagation: "Bidirectional" - mountPath: /csi name: socket-dir @@ -103,7 +103,7 @@ spec: volumes: - name: pods-mount-dir hostPath: - path: /var/lib/kubelet/pods + path: {{ .Values.kubeletDir }}/pods type: Directory - name: socket-dir emptyDir: {} diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml index 03135e53b..8286ef4d1 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml @@ -60,7 +60,7 @@ spec: - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) env: - name: DRIVER_REG_SOCK_PATH - value: /var/lib/kubelet/plugins/csi-nfsplugin/csi.sock + value: {{ .Values.kubeletDir }}/plugins/csi-nfsplugin/csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: @@ -109,19 +109,19 @@ spec: - name: socket-dir mountPath: /csi - name: pods-mount-dir - mountPath: /var/lib/kubelet/pods + mountPath: {{ .Values.kubeletDir }}/pods mountPropagation: "Bidirectional" resources: {{- toYaml .Values.node.resources.nfs | nindent 12 }} volumes: - name: socket-dir hostPath: - path: /var/lib/kubelet/plugins/csi-nfsplugin + path: {{ .Values.kubeletDir }}/plugins/csi-nfsplugin type: DirectoryOrCreate - name: pods-mount-dir hostPath: - path: /var/lib/kubelet/pods + path: {{ .Values.kubeletDir }}/pods type: Directory - hostPath: - path: /var/lib/kubelet/plugins_registry + path: {{ .Values.kubeletDir }}/plugins_registry type: Directory name: registration-dir diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index 6010738ec..7f189bf8c 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -32,6 +32,8 @@ feature: enableFSGroupPolicy: true enableInlineVolume: false +kubeletDir: /var/lib/kubelet + controller: name: csi-nfs-controller replicas: 1