fix commits and add tests

hashicorp · Aug 14, 2024 · 330b64c · 330b64c
1 parent 36f9fcd
commit 330b64c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/templates/csi-daemonset.yaml b/templates/csi-daemonset.yaml
@@ -43,7 +43,7 @@ spec:
       {{- if .Values.csi.priorityClassName }}
       priorityClassName: {{ .Values.csi.priorityClassName }}
       {{- end }}
-      hostNetwork: {{ default false .Values.hostNetwork }}
+      hostNetwork: {{ .Values.csi.hostNetwork }}
       serviceAccountName: {{ template "vault.fullname" . }}-csi-provider
       {{- template "csi.pod.tolerations" . }}
       {{- template "csi.pod.nodeselector" . }}

diff --git a/test/unit/csi-daemonset.bats b/test/unit/csi-daemonset.bats
@@ -535,6 +535,28 @@ load _helpers
   [ "${actual}" = "true" ]
 }
 
+#--------------------------------------------------------------------
+# hostNetwork
+
+@test "csi/daemonset: csi.hostNetwork not set" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/csi-daemonset.yaml \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.hostNetwork' | tee /dev/stderr)
+  [ "${actual}" = "false" ]
+}
+
+@test "server/StatefulSet: server.hostNetwork is set" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/csi-daemonset.yaml \
+      --set 'csi.hostNetwork=true' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.hostNetwork' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
 #--------------------------------------------------------------------
 # Readiness/liveness probes
 

diff --git a/values.schema.json b/values.schema.json
@@ -197,6 +197,9 @@
                 "resources": {
                     "type": "object"
                 },
+                "hostNetwork": {
+                    "type": "boolean"
+                },
                 "serviceAccount": {
                     "type": "object",
                     "properties": {

diff --git a/values.yaml b/values.yaml
@@ -1119,6 +1119,9 @@ csi:
   # generating secret versions.
   hmacSecretName: ""
 
+  #Allow modification of the hostNetwork parameter to avoid the need of a dedicated pod ip
+  hostNetwork: false
+
   # Settings for the daemonSet used to run the provider.
   daemonSet:
     updateStrategy: