Merge pull request #409 from eyenx/feature/add-etc-kubernetes-path

feat(values): add kubernetesRootDir
kubernetes-sigs · Jan 8, 2021 · e2108be · e2108be
2 parents 08de179 + d7dcd14
commit e2108be
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/manifest_staging/charts/secrets-store-csi-driver/Chart.yaml b/manifest_staging/charts/secrets-store-csi-driver/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: secrets-store-csi-driver
-version: 0.0.18
-appVersion: 0.0.18
+version: 0.0.19
+appVersion: 0.0.19
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes cluster.
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png

diff --git a/manifest_staging/charts/secrets-store-csi-driver/README.md b/manifest_staging/charts/secrets-store-csi-driver/README.md
@@ -29,6 +29,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `linux.driver.resources`                | The resource request/limits for the linux secrets-store container image                                                           | `limits: 200m CPU, 200Mi; requests: 50m CPU, 100Mi` |
 | `linux.enabled`                         | Install secrets store csi driver on linux nodes                                                                                   | true                                                |
 | `linux.kubeletRootDir`                  | Configure the kubelet root dir                                                                                                    | `/var/lib/kubelet`                                  |
+| `linux.providersDir`                    | Configure the providers root dir                                                                                                  | `/etc/kubernetes/secrets-store-csi-providers`       |
 | `linux.nodeSelector`                    | Node Selector for the daemonset on linux nodes                                                                                    | `{}`                                                |
 | `linux.tolerations`                     | Tolerations for the daemonset on linux nodes                                                                                      | `[]`                                                |
 | `linux.metricsAddr`                     | The address the metric endpoint binds to                                                                                          | `:8095`                                             |
@@ -50,6 +51,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `windows.driver.resources`              | The resource request/limits for the windows secrets-store container image                                                         | `limits: 400m CPU, 400Mi; requests: 50m CPU, 100Mi` |
 | `windows.enabled`                       | Install secrets store csi driver on windows nodes                                                                                 | false                                               |
 | `windows.kubeletRootDir`                | Configure the kubelet root dir                                                                                                    | `C:\var\lib\kubelet`                                |
+| `windows.providersDir`                  | Configure the providers root dir                                                                                                  | `C:\k\secrets-store-csi-providers`                  |
 | `windows.nodeSelector`                  | Node Selector for the daemonset on windows nodes                                                                                  | `{}`                                                |
 | `windows.tolerations`                   | Tolerations for the daemonset on windows nodes                                                                                    | `[]`                                                |
 | `windows.metricsAddr`                   | The address the metric endpoint binds to                                                                                          | `:8095`                                             |

diff --git a/...t_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml b/...t_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml
@@ -142,7 +142,7 @@ spec:
             type: DirectoryOrCreate
         - name: providers-dir
           hostPath:
-            path: C:\k\secrets-store-csi-providers\
+            path: {{ .Values.windows.providersDir }}
             type: DirectoryOrCreate
       nodeSelector:
         kubernetes.io/os: windows

diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml b/manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml
@@ -145,7 +145,7 @@ spec:
             type: DirectoryOrCreate
         - name: providers-dir
           hostPath:
-            path: /etc/kubernetes/secrets-store-csi-providers
+            path: {{ .Values.linux.providersDir }}
             type: DirectoryOrCreate
       nodeSelector:
         kubernetes.io/os: linux

diff --git a/manifest_staging/charts/secrets-store-csi-driver/values.yaml b/manifest_staging/charts/secrets-store-csi-driver/values.yaml
@@ -48,6 +48,7 @@ linux:
       maxUnavailable: 1
 
   kubeletRootDir: /var/lib/kubelet
+  providersDir: /etc/kubernetes/secrets-store-csi-providers
   nodeSelector: {}
   tolerations: []
   metricsAddr: ":8095"
@@ -105,6 +106,7 @@ windows:
       maxUnavailable: 1
 
   kubeletRootDir: C:\var\lib\kubelet
+  providersDir: C:\k\secrets-store-csi-providers
   nodeSelector: {}
   tolerations: []
   metricsAddr: ":8095"