From d9fdc3ba950288fca38f9feded546c39b7dfa975 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 19 Sep 2022 17:18:06 +0300 Subject: [PATCH] [bitnami/schema-registry] Use custom probes if given (#12555) Without this change, in order to use a custom probe, the user has to specify the probe parameters, and also must specify for the original probe "enabled: false". Issue: #12354 Signed-off-by: Orgad Shaneh Signed-off-by: Orgad Shaneh --- bitnami/schema-registry/Chart.yaml | 2 +- .../schema-registry/templates/statefulset.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bitnami/schema-registry/Chart.yaml b/bitnami/schema-registry/Chart.yaml index de5eb2acd..209be4a93 100644 --- a/bitnami/schema-registry/Chart.yaml +++ b/bitnami/schema-registry/Chart.yaml @@ -28,4 +28,4 @@ maintainers: name: schema-registry sources: - https://github.com/bitnami/containers/tree/main/bitnami/schema-registry -version: 5.1.4 +version: 5.1.5 diff --git a/bitnami/schema-registry/templates/statefulset.yaml b/bitnami/schema-registry/templates/statefulset.yaml index 984a08a11..584de83f0 100644 --- a/bitnami/schema-registry/templates/statefulset.yaml +++ b/bitnami/schema-registry/templates/statefulset.yaml @@ -202,26 +202,26 @@ spec: containerPort: 8081 protocol: TCP {{- if not .Values.diagnosticMode.enabled }} - {{- if .Values.livenessProbe.enabled }} + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.livenessProbe "enabled") "context" $) | nindent 12 }} tcpSocket: port: http - {{- else if .Values.customLivenessProbe }} - livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }} {{- end }} - {{- if .Values.readinessProbe.enabled }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.readinessProbe "enabled") "context" $) | nindent 12 }} tcpSocket: port: http - {{- else if .Values.customReadinessProbe }} - readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }} {{- end }} - {{- if .Values.startupProbe.enabled }} + {{- if .Values.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.startupProbe.enabled }} startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.startupProbe "enabled") "context" $) | nindent 12 }} tcpSocket: port: http - {{- else if .Values.customStartupProbe }} - startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }} {{- end }} {{- end }} {{- if .Values.resources }}