Merge pull request #120 from sdrik/non-standard-kubelet-root-dir

Add support for non-standard kubelet root directory

Author: jetstack-bot

deploy/charts/csi-driver/README.md

@@ -24,6 +24,7 @@ A Helm chart for cert-manager-csi-driver
 | app.driver.csiDataDir | string | `"/tmp/cert-manager-csi-driver"` | Configures the hostPath directory that the driver will write and mount volumes from. |
 | app.driver.name | string | `"csi.cert-manager.io"` | Name of the driver which will be registered with Kubernetes. |
 | app.driver.useTokenRequest | bool | `false` | If enabled, will use CSI token request for creating CertificateRequests. CertificateRequests will be created via mounting pod's service accounts. |
+| app.kubeletRootDir | string | `"/var/lib/kubelet"` | Overrides path to root kubelet directory in case of a non-standard k8s install. |
 | app.livenessProbe | object | `{"port":9809}` | Options for the liveness container. |
 | app.livenessProbe.port | int | `9809` | The port that will expose the livness of the csi-driver |
 | app.logLevel | int | `1` | Verbosity of cert-manager-csi-driver logging. |

deploy/charts/csi-driver/templates/daemonset.yaml

@@ -26,7 +26,7 @@ spec:
           args:
             - -v={{ .Values.app.logLevel }}
             - --csi-address=/plugin/csi.sock
-            - --kubelet-registration-path=/var/lib/kubelet/plugins/cert-manager-csi-driver/csi.sock
+            - --kubelet-registration-path={{ .Values.app.kubeletRootDir }}/plugins/cert-manager-csi-driver/csi.sock
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
@@ -76,7 +76,7 @@ spec:
             - name: plugin-dir
               mountPath: /plugin
             - name: pods-mount-dir
-              mountPath: /var/lib/kubelet/pods
+              mountPath: {{ .Values.app.kubeletRootDir }}/pods
               mountPropagation: "Bidirectional"
             - name: csi-data-dir
               mountPath: /csi-data-dir
@@ -103,14 +103,14 @@ spec:
       volumes:
         - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/cert-manager-csi-driver
+            path: {{ .Values.app.kubeletRootDir }}/plugins/cert-manager-csi-driver
             type: DirectoryOrCreate
         - name: pods-mount-dir
           hostPath:
-            path: /var/lib/kubelet/pods
+            path: {{ .Values.app.kubeletRootDir }}/pods
             type: Directory
         - hostPath:
-            path: /var/lib/kubelet/plugins_registry
+            path: {{ .Values.app.kubeletRootDir }}/plugins_registry
             type: Directory
           name: registration-dir
         - hostPath:

deploy/charts/csi-driver/values.yaml

@@ -43,6 +43,8 @@ app:
   livenessProbe:
     # -- The port that will expose the livness of the csi-driver
     port: 9809
+  # -- Overrides path to root kubelet directory in case of a non-standard k8s install.
+  kubeletRootDir: /var/lib/kubelet
 
 resources: {}
   # -- Kubernetes pod resource limits for cert-manager-csi-driver