From 7e21a09ebd9fb7890c5dfe90c4716b50d1662637 Mon Sep 17 00:00:00 2001 From: Tom Proctor Date: Mon, 12 Sep 2022 15:17:24 +0100 Subject: [PATCH] Add server.hostNetwork option (#775) --- templates/server-statefulset.yaml | 4 ++++ test/unit/server-statefulset.bats | 24 +++++++++++++++++++++++- values.schema.json | 3 +++ values.yaml | 2 ++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml index afc48d6..fb3cbfa 100644 --- a/templates/server-statefulset.yaml +++ b/templates/server-statefulset.yaml @@ -49,6 +49,10 @@ spec: shareProcessNamespace: true {{ end }} {{- template "server.statefulSet.securityContext.pod" . }} + {{- if not .Values.global.openshift }} + hostNetwork: {{ .Values.server.hostNetwork }} + {{- end }} + volumes: {{ template "vault.volumes" . }} - name: home diff --git a/test/unit/server-statefulset.bats b/test/unit/server-statefulset.bats index 8476611..6206e11 100755 --- a/test/unit/server-statefulset.bats +++ b/test/unit/server-statefulset.bats @@ -1783,4 +1783,26 @@ load _helpers . | tee /dev/stderr | yq -r '.spec.template.spec.containers[0].securityContext.foo' | tee /dev/stderr) [ "${actual}" = "bar" ] -} \ No newline at end of file +} + +#-------------------------------------------------------------------- +# hostNetwork + +@test "server/StatefulSet: server.hostNetwork not set" { + cd `chart_dir` + local actual=$(helm template \ + --show-only templates/server-statefulset.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/server-statefulset.yaml \ + --set 'server.hostNetwork=true' \ + . | tee /dev/stderr | + yq -r '.spec.template.spec.hostNetwork' | tee /dev/stderr) + [ "${actual}" = "true" ] +} diff --git a/values.schema.json b/values.schema.json index aad7ee7..676efb7 100644 --- a/values.schema.json +++ b/values.schema.json @@ -979,6 +979,9 @@ "null", "array" ] + }, + "hostNetwork": { + "type": "boolean" } } }, diff --git a/values.yaml b/values.yaml index c4ac1ea..892d2a4 100644 --- a/values.yaml +++ b/values.yaml @@ -876,6 +876,8 @@ server: pod: {} container: {} + # Should the server pods run on the host network + hostNetwork: false # Vault UI ui: