diff --git a/helm-chart/csi-driver/templates/daemonset.yaml b/helm-chart/csi-driver/templates/daemonset.yaml index c8aacb5e..0f2d01b7 100644 --- a/helm-chart/csi-driver/templates/daemonset.yaml +++ b/helm-chart/csi-driver/templates/daemonset.yaml @@ -27,11 +27,14 @@ spec: - name: ADDRESS value: /csi/csi.sock - name: DRIVER_REG_SOCK_PATH - value: /var/lib/kubelet/plugins/linodebs.csi.linode.com/csi.sock + value: {{ .Values.kubeletPath | default "/var/lib/kubelet" }}/plugins/linodebs.csi.linode.com/csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName + {{- with .Values.csiNodeDriverRegistrar.env }} + {{- toYaml . | nindent 8 }} + {{- end }} image: {{ .Values.csiNodeDriverRegistrar.image}}:{{ .Values.csiNodeDriverRegistrar.tag}} name: csi-node-driver-registrar securityContext: @@ -44,6 +47,9 @@ spec: name: plugin-dir - mountPath: /registration name: registration-dir + {{- with .Values.csiNodeDriverRegistrar.volumeMounts }} + {{- toYaml . | nindent 8 }} + {{- end }} - args: - --v=2 env: @@ -100,15 +106,15 @@ spec: operator: Exists volumes: - hostPath: - path: /var/lib/kubelet/plugins_registry/ + path: {{ .Values.kubeletPath | default "/var/lib/kubelet" }}/plugins_registry/ type: DirectoryOrCreate name: registration-dir - hostPath: - path: /var/lib/kubelet + path: {{ .Values.kubeletPath | default "/var/lib/kubelet" }} type: Directory name: kubelet-dir - hostPath: - path: /var/lib/kubelet/plugins/linodebs.csi.linode.com + path: {{ .Values.kubeletPath | default "/var/lib/kubelet" }}/plugins/linodebs.csi.linode.com type: DirectoryOrCreate name: plugin-dir - hostPath: diff --git a/helm-chart/csi-driver/values.yaml b/helm-chart/csi-driver/values.yaml index af4ccdfe..46620b01 100644 --- a/helm-chart/csi-driver/values.yaml +++ b/helm-chart/csi-driver/values.yaml @@ -23,6 +23,9 @@ volumeLabelPrefix: "" # Default namespace is "kube-system" but it can be set to another namespace namespace: kube-system +# Add a kubelet path variable to be used across containers for alternate k8s distros (e.g K0s, K3s) +kubeletPath: "/var/lib/kubelet" + # Set these values if your APIToken and region are already present in a k8s secret. # secretRef: # name: "linode" @@ -91,6 +94,10 @@ kubectl: csiNodeDriverRegistrar: image: registry.k8s.io/sig-storage/csi-node-driver-registrar tag: v2.12.0 + # Additional environment variables for the node driver registrar container + env: [] + # Additional volume mounts for the node driver registrar container + volumeMounts: [] controller: nodeSelector: {}