From b1376ef91210fc57d84a592b8e59ab39589afd82 Mon Sep 17 00:00:00 2001 From: Stefan McShane Date: Fri, 8 Dec 2023 13:45:53 -0500 Subject: [PATCH 1/3] allow full probe overrides --- applications/web/templates/deployment.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/applications/web/templates/deployment.yaml b/applications/web/templates/deployment.yaml index 38c969e61..8ab5b19a8 100644 --- a/applications/web/templates/deployment.yaml +++ b/applications/web/templates/deployment.yaml @@ -148,6 +148,19 @@ spec: successThreshold: {{ .Values.health.livenessCommand.successThreshold }} failureThreshold: {{ .Values.health.livenessCommand.failureThreshold }} {{ end }} + {{ if .Values.health.readinessCommand.enabled }} + readinessProbe: + exec: + command: + {{- range $command := trim .Values.health.readinessCommand.command | splitList " " }} + - {{ $command | quote }} + {{- end }} + initialDelaySeconds: {{ .Values.health.readinessCommand.initialDelaySeconds }} + periodSeconds: {{ .Values.health.readinessCommand.periodSeconds }} + timeoutSeconds: {{ .Values.health.readinessCommand.timeoutSeconds }} + successThreshold: {{ .Values.health.readinessCommand.successThreshold }} + failureThreshold: {{ .Values.health.readinessCommand.failureThreshold }} + {{ end }} {{ if .Values.health.readinessProbe.enabled }} readinessProbe: httpGet: @@ -194,6 +207,9 @@ spec: successThreshold: {{ .Values.health.startupProbe.successThreshold }} failureThreshold: {{ .Values.health.startupProbe.failureThreshold }} {{ end }} + {{ if .Values.health.overrides.enabled }} + {{- toYaml .Values.overrides.probes | nindent 10 }} + {{ end }} resources: requests: cpu: {{ .Values.resources.requests.cpu }} From 8ac23071b5a0e231089d9c4ca11c2dcb314d9433 Mon Sep 17 00:00:00 2001 From: Stefan McShane Date: Fri, 8 Dec 2023 13:46:33 -0500 Subject: [PATCH 2/3] allow full probe overrides --- applications/web/templates/deployment.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/applications/web/templates/deployment.yaml b/applications/web/templates/deployment.yaml index 8ab5b19a8..c7d85d6e8 100644 --- a/applications/web/templates/deployment.yaml +++ b/applications/web/templates/deployment.yaml @@ -148,19 +148,6 @@ spec: successThreshold: {{ .Values.health.livenessCommand.successThreshold }} failureThreshold: {{ .Values.health.livenessCommand.failureThreshold }} {{ end }} - {{ if .Values.health.readinessCommand.enabled }} - readinessProbe: - exec: - command: - {{- range $command := trim .Values.health.readinessCommand.command | splitList " " }} - - {{ $command | quote }} - {{- end }} - initialDelaySeconds: {{ .Values.health.readinessCommand.initialDelaySeconds }} - periodSeconds: {{ .Values.health.readinessCommand.periodSeconds }} - timeoutSeconds: {{ .Values.health.readinessCommand.timeoutSeconds }} - successThreshold: {{ .Values.health.readinessCommand.successThreshold }} - failureThreshold: {{ .Values.health.readinessCommand.failureThreshold }} - {{ end }} {{ if .Values.health.readinessProbe.enabled }} readinessProbe: httpGet: From 1aacac4af9ed74b6c3219195f61d35c44c88cacc Mon Sep 17 00:00:00 2001 From: Stefan McShane Date: Fri, 8 Dec 2023 13:55:48 -0500 Subject: [PATCH 3/3] allow full probe overrides --- applications/web/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/web/templates/deployment.yaml b/applications/web/templates/deployment.yaml index c7d85d6e8..4eb01d93c 100644 --- a/applications/web/templates/deployment.yaml +++ b/applications/web/templates/deployment.yaml @@ -194,8 +194,8 @@ spec: successThreshold: {{ .Values.health.startupProbe.successThreshold }} failureThreshold: {{ .Values.health.startupProbe.failureThreshold }} {{ end }} - {{ if .Values.health.overrides.enabled }} - {{- toYaml .Values.overrides.probes | nindent 10 }} + {{ if .Values.health.overrides }} + {{- toYaml .Values.health.overrides.probes | nindent 10 }} {{ end }} resources: requests: