feat(scaleway-csi): allow custom kubelet directory (#28)

scaleway · Sep 9, 2024 · 14f7fdb · 14f7fdb
1 parent 4831692
commit 14f7fdb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/charts/scaleway-csi/Chart.yaml b/charts/scaleway-csi/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: scaleway-csi
 description: A Helm chart for the Scaleway CSI plugin
 type: application
-version: 0.1.2
+version: 0.1.3
 appVersion: "v0.2.3"
 sources:
   - https://github.com/scaleway/scaleway-csi

diff --git a/charts/scaleway-csi/templates/node/daemonset.yaml b/charts/scaleway-csi/templates/node/daemonset.yaml
@@ -73,7 +73,7 @@ spec:
             - name: plugin-dir
               mountPath: /csi
             - name: kubelet-dir
-              mountPath: /var/lib/kubelet
+              mountPath: {{ .Values.node.kubeletDir }}
               mountPropagation: "Bidirectional"
             - name: device-dir
               mountPath: /dev
@@ -89,7 +89,7 @@ spec:
             - name: CSI_ADDRESS
               value: /csi/csi.sock
             - name: KUBELET_REGISTRATION_PATH
-              value: /var/lib/kubelet/plugins/csi.scaleway.com/csi.sock
+              value: {{ .Values.node.kubeletDir }}/plugins/csi.scaleway.com/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -120,15 +120,15 @@ spec:
       volumes:
         - name: registration-dir
           hostPath:
-            path: /var/lib/kubelet/plugins_registry/
+            path: {{ .Values.node.kubeletDir }}/plugins_registry/
             type: DirectoryOrCreate
         - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/csi.scaleway.com
+            path: {{ .Values.node.kubeletDir }}/plugins/csi.scaleway.com
             type: DirectoryOrCreate
         - name: kubelet-dir
           hostPath:
-            path: /var/lib/kubelet
+            path: {{ .Values.node.kubeletDir }}
             type: Directory
         - name: device-dir
           hostPath:

diff --git a/charts/scaleway-csi/values.yaml b/charts/scaleway-csi/values.yaml
@@ -179,6 +179,12 @@ controller:
 node:
   enabled: true
 
+  # Update this according to the Kubernetes distribution you are using:
+  # - Standard: /var/lib/kubelet
+  # - k0s: /var/lib/k0s/kubelet
+  # - microk8s: /var/snap/microk8s/common/var/lib/kubelet
+  kubeletDir: /var/lib/kubelet
+
   podAnnotations: {}
   nodeSelector:
     kubernetes.io/os: linux