allow to configure publishNotReadyAddresses on server services

hashicorp · Feb 25, 2022 · 0b8db8b · 0b8db8b
1 parent b447a92
commit 0b8db8b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 4 deletions.
diff --git a/templates/server-ha-active-service.yaml b/templates/server-ha-active-service.yaml
@@ -22,7 +22,7 @@ spec:
   clusterIP: {{ .Values.server.service.clusterIP }}
   {{- end }}
   {{- include "service.externalTrafficPolicy" .Values.server.service }}
-  publishNotReadyAddresses: true
+  publishNotReadyAddresses: {{ .Values.server.publishNotReadyAddresses }}
   ports:
     - name: {{ include "vault.scheme" . }}
       port: {{ .Values.server.service.port }}

diff --git a/templates/server-ha-standby-service.yaml b/templates/server-ha-standby-service.yaml
@@ -22,7 +22,7 @@ spec:
   clusterIP: {{ .Values.server.service.clusterIP }}
   {{- end }}
   {{- include "service.externalTrafficPolicy" .Values.server.service }}
-  publishNotReadyAddresses: true
+  publishNotReadyAddresses: {{ .Values.server.publishNotReadyAddresses }}
   ports:
     - name: {{ include "vault.scheme" . }}
       port: {{ .Values.server.service.port }}

diff --git a/templates/server-headless-service.yaml b/templates/server-headless-service.yaml
@@ -16,7 +16,7 @@ metadata:
 {{ template "vault.service.annotations" .}}
 spec:
   clusterIP: None
-  publishNotReadyAddresses: true
+  publishNotReadyAddresses: {{ .Values.server.publishNotReadyAddresses }}
   ports:
     - name: "{{ include "vault.scheme" . }}"
       port: {{ .Values.server.service.port }}

diff --git a/templates/server-service.yaml b/templates/server-service.yaml
@@ -24,7 +24,7 @@ spec:
   {{- include "service.externalTrafficPolicy" .Values.server.service }}
   # We want the servers to become available even if they're not ready
   # since this DNS is also used for join operations.
-  publishNotReadyAddresses: true
+  publishNotReadyAddresses: {{ .Values.server.publishNotReadyAddresses }}
   ports:
     - name: {{ include "vault.scheme" . }}
       port: {{ .Values.server.service.port }}

diff --git a/test/unit/server-service.bats b/test/unit/server-service.bats
@@ -175,6 +175,13 @@ load _helpers
       . | tee /dev/stderr |
       yq -r '.spec.publishNotReadyAddresses' | tee /dev/stderr)
   [ "${actual}" = "true" ]
+
+  local actual=$(helm template \
+      --show-only templates/server-service.yaml \
+      --set 'server.publishNotReadyAddresses=false' \
+      . | tee /dev/stderr |
+      yq -r '.spec.publishNotReadyAddresses' | tee /dev/stderr)
+  [ "${actual}" = "false" ]
 }
 
 @test "server/Service: type empty by default" {

diff --git a/values.schema.json b/values.schema.json
@@ -483,6 +483,9 @@
                 "enabled": {
                     "type": "boolean"
                 },
+                "publishNotReadyAddresses": {
+                    "type": "boolean"
+                },
                 "enterpriseLicense": {
                     "type": "object",
                     "properties": {

diff --git a/values.yaml b/values.yaml
@@ -218,6 +218,8 @@ server:
   # If not set to true, Vault server will not be installed. See vault.mode in _helpers.tpl for implementation details
   enabled: true
 
+  publishNotReadyAddresses: true
+
   # [Enterprise Only] This value refers to a Kubernetes secret that you have
   # created that contains your enterprise license. If you are not using an
   # enterprise image or if you plan to introduce the license key via another