From 9f189801a6317350bb61b1c49ceaa7e703524137 Mon Sep 17 00:00:00 2001
From: Bhargav Akhani <47673253+bhargav2427@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:47:24 +0530
Subject: [PATCH] Add portnumber (#831)

* Add configurable Port Number in readinessProbe and livenessProbe for the server-statefulset.
Co-authored-by: Kyle Schochenmaier <kyle.schochenmaier@hashicorp.com>
---
 templates/server-statefulset.yaml |  4 ++--
 test/unit/server-statefulset.bats | 27 +++++++++++++++++++++++++++
 values.yaml                       |  4 ++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml
index d7a34ac..7ab7de8 100644
--- a/templates/server-statefulset.yaml
+++ b/templates/server-statefulset.yaml
@@ -156,7 +156,7 @@ spec:
             {{- if .Values.server.readinessProbe.path }}
             httpGet:
               path: {{ .Values.server.readinessProbe.path | quote }}
-              port: 8200
+              port: {{ .Values.server.readinessProbe.port }}
               scheme: {{ include "vault.scheme" . | upper }}
             {{- else }}
             # Check status; unsealed vault servers return 0
@@ -177,7 +177,7 @@ spec:
           livenessProbe:
             httpGet:
               path: {{ .Values.server.livenessProbe.path | quote }}
-              port: 8200
+              port: {{ .Values.server.livenessProbe.port }}
               scheme: {{ include "vault.scheme" . | upper }}
             failureThreshold: {{ .Values.server.livenessProbe.failureThreshold }}
             initialDelaySeconds: {{ .Values.server.livenessProbe.initialDelaySeconds }}
diff --git a/test/unit/server-statefulset.bats b/test/unit/server-statefulset.bats
index e56ce84..510c888 100755
--- a/test/unit/server-statefulset.bats
+++ b/test/unit/server-statefulset.bats
@@ -1829,3 +1829,30 @@ load _helpers
       yq -r '.name' | tee /dev/stderr)
   [ "${actual}" = "foo" ]
 }
+
+#--------------------------------------------------------------------
+# readinessProbe
+
+@test "server/StatefulSet: server.readinessProbe.port is set" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/server-statefulset.yaml \
+      --set 'server.readinessProbe.enabled=true' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.containers[0].readinessProbe.httpGet.port' | tee /dev/stderr)
+  [ "${actual}" = "8200" ]
+}
+
+
+#--------------------------------------------------------------------
+# livenessProbe
+
+@test "server/StatefulSet: server.livenessProbe.port is set" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/server-statefulset.yaml \
+      --set 'server.livenessProbe.enabled=true' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.containers[0].livenessProbe.httpGet.port' | tee /dev/stderr)
+  [ "${actual}" = "8200" ]
+}
diff --git a/values.yaml b/values.yaml
index 08b1ad1..e599927 100644
--- a/values.yaml
+++ b/values.yaml
@@ -505,6 +505,8 @@ server:
     # If you need to use a http path instead of the default exec
     # path: /v1/sys/health?standbyok=true
 
+    # Port number on which readinessProbe will be checked.
+    port: 8200
     # When a probe fails, Kubernetes will try failureThreshold times before giving up
     failureThreshold: 2
     # Number of seconds after the container has started before probe initiates
@@ -519,6 +521,8 @@ server:
   livenessProbe:
     enabled: false
     path: "/v1/sys/health?standbyok=true"
+    # Port nuumber on which livenessProbe will be checked.
+    port: 8200
     # When a probe fails, Kubernetes will try failureThreshold times before giving up
     failureThreshold: 2
     # Number of seconds after the container has started before probe initiates