feat(csi/providersDir): add configurable providersDir

[eyenx]

• Adds a configurable providersDir path for the Daemonset

Background: with kubernetes-sigs/secrets-store-csi-driver#409 the providersDir path has been made configurable for secrets-store-csi-driver, as not every single kubernetes distribution out there uses the same path.

This is why we should also allow vault-helm to set providersDir accordingly. Default will remain /etc/kubernetes/secrets-store-csi-providers

Signed-off-by: Toni Tauro toni.tauro@adfinis.com

[eyenx]

@jasonodonnell Can you please review this PR?

We can't upgrade the vault integration on a cluster due to it being using differente providersDir paths.

[eyenx]

Thanks for the review

Please re-review @benashz

[benashz]

Thanks @eyenx . I think all that is missing now are some unit tests. I think the following patch should suffice:

diff --git a/test/unit/csi-daemonset.bats b/test/unit/csi-daemonset.bats
index c546d0a..5cfd8a7 100644
--- a/test/unit/csi-daemonset.bats
+++ b/test/unit/csi-daemonset.bats
@@ -315,6 +315,68 @@ load _helpers
   [ "${actual}" = "{}" ]
 }
 
+@test "csi/daemonset: csi providersDir default" {
+  cd `chart_dir`
+
+  # Test that it defines it
+  local object=$(helm template \
+      --show-only templates/csi-daemonset.yaml  \
+      --set 'csi.enabled=true' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.volumes[] | select(.name == "providervol")' | tee /dev/stderr)
+
+  local actual=$(echo $object |
+      yq -r '.hostPath.path' | tee /dev/stderr)
+  [ "${actual}" = "/etc/kubernetes/secrets-store-csi-providers" ]
+}
+
+@test "csi/daemonset: csi kubeletRootDir default" {
+  cd `chart_dir`
+
+  # Test that it defines it
+  local object=$(helm template \
+      --show-only templates/csi-daemonset.yaml  \
+      --set 'csi.enabled=true' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.volumes[] | select(.name == "mountpoint-dir")' | tee /dev/stderr)
+
+  local actual=$(echo $object |
+      yq -r '.hostPath.path' | tee /dev/stderr)
+  [ "${actual}" = "/var/lib/kubelet/pods" ]
+}
+
+@test "csi/daemonset: csi providersDir override " {
+  cd `chart_dir`
+
+  # Test that it defines it
+  local object=$(helm template \
+      --show-only templates/csi-daemonset.yaml  \
+      --set 'csi.enabled=true' \
+      --set 'csi.daemonSet.providersDir=/alt/csi-prov-dir' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.volumes[] | select(.name == "providervol")' | tee /dev/stderr)
+
+  local actual=$(echo $object |
+      yq -r '.hostPath.path' | tee /dev/stderr)
+  [ "${actual}" = "/alt/csi-prov-dir" ]
+}
+
+@test "csi/daemonset: csi kubeletRootDir override" {
+  cd `chart_dir`
+
+  # Test that it defines it
+  local object=$(helm template \
+      --show-only templates/csi-daemonset.yaml  \
+      --set 'csi.enabled=true' \
+      --set 'csi.daemonSet.kubeletRootDir=/alt/kubelet-root' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.volumes[] | select(.name == "mountpoint-dir")' | tee /dev/stderr)
+
+  local actual=$(echo $object |
+      yq -r '.hostPath.path' | tee /dev/stderr)
+  [ "${actual}" = "/alt/kubelet-root/pods" ]
+}
+
 #--------------------------------------------------------------------
 # volumeMounts

$ make test-unit UNIT_TESTS_FILTER='.+csi.+Dir.+' 
1..4
ok 1 csi/daemonset: csi providersDir default
ok 2 csi/daemonset: csi kubeletRootDir default
ok 3 csi/daemonset: csi providersDir override 
ok 4 csi/daemonset: csi kubeletRootDir override

[eyenx]

thanks @benashz, added your suggested changes in b2af383

[benashz]

LGTM!

Thank you for your contribution to HashiCorp!

[eyenx]

My pleasure