Add portnumber (#831)

* Add configurable Port Number in readinessProbe and livenessProbe for the server-statefulset. 
Co-authored-by: Kyle Schochenmaier <kyle.schochenmaier@hashicorp.com>
This commit is contained in:
Bhargav Akhani 2023-04-04 19:47:24 +05:30 committed by GitHub
parent 2c4cd3a3c3
commit 9f189801a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 2 deletions

View file

@ -156,7 +156,7 @@ spec:
{{- if .Values.server.readinessProbe.path }} {{- if .Values.server.readinessProbe.path }}
httpGet: httpGet:
path: {{ .Values.server.readinessProbe.path | quote }} path: {{ .Values.server.readinessProbe.path | quote }}
port: 8200 port: {{ .Values.server.readinessProbe.port }}
scheme: {{ include "vault.scheme" . | upper }} scheme: {{ include "vault.scheme" . | upper }}
{{- else }} {{- else }}
# Check status; unsealed vault servers return 0 # Check status; unsealed vault servers return 0
@ -177,7 +177,7 @@ spec:
livenessProbe: livenessProbe:
httpGet: httpGet:
path: {{ .Values.server.livenessProbe.path | quote }} path: {{ .Values.server.livenessProbe.path | quote }}
port: 8200 port: {{ .Values.server.livenessProbe.port }}
scheme: {{ include "vault.scheme" . | upper }} scheme: {{ include "vault.scheme" . | upper }}
failureThreshold: {{ .Values.server.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.server.livenessProbe.failureThreshold }}
initialDelaySeconds: {{ .Values.server.livenessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.server.livenessProbe.initialDelaySeconds }}

View file

@ -1829,3 +1829,30 @@ load _helpers
yq -r '.name' | tee /dev/stderr) yq -r '.name' | tee /dev/stderr)
[ "${actual}" = "foo" ] [ "${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" ]
}

View file

@ -505,6 +505,8 @@ server:
# If you need to use a http path instead of the default exec # If you need to use a http path instead of the default exec
# path: /v1/sys/health?standbyok=true # 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 # When a probe fails, Kubernetes will try failureThreshold times before giving up
failureThreshold: 2 failureThreshold: 2
# Number of seconds after the container has started before probe initiates # Number of seconds after the container has started before probe initiates
@ -519,6 +521,8 @@ server:
livenessProbe: livenessProbe:
enabled: false enabled: false
path: "/v1/sys/health?standbyok=true" 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 # When a probe fails, Kubernetes will try failureThreshold times before giving up
failureThreshold: 2 failureThreshold: 2
# Number of seconds after the container has started before probe initiates # Number of seconds after the container has started before probe initiates