From b95b36668e9ea8d1ccf1ea5fbb7f79e2259d0310 Mon Sep 17 00:00:00 2001
From: enixon <brian.nixon.cs@gmail.com>
Date: Thu, 3 Jun 2021 23:24:58 -0700
Subject: [PATCH] [bitnami/zookeeper] add customLivenessProbe and
 customReadinessProbe (#6547)

---
 bitnami/zookeeper/Chart.yaml                 | 2 +-
 bitnami/zookeeper/README.md                  | 2 ++
 bitnami/zookeeper/templates/statefulset.yaml | 4 ++++
 bitnami/zookeeper/values.yaml                | 8 ++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bitnami/zookeeper/Chart.yaml b/bitnami/zookeeper/Chart.yaml
index 29bcba1d6..62396f9b6 100644
--- a/bitnami/zookeeper/Chart.yaml
+++ b/bitnami/zookeeper/Chart.yaml
@@ -21,4 +21,4 @@ name: zookeeper
 sources:
   - https://github.com/bitnami/bitnami-docker-zookeeper
   - https://zookeeper.apache.org/
-version: 6.7.4
+version: 6.8.0
diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md
index 1054175f8..904236cc5 100644
--- a/bitnami/zookeeper/README.md
+++ b/bitnami/zookeeper/README.md
@@ -126,6 +126,8 @@ The following tables lists the configurable parameters of the ZooKeeper chart an
 | `resources`                          | CPU/Memory resource requests/limits                                                       | Memory: `256Mi`, CPU: `250m`   |
 | `livenessProbe`                      | Liveness probe configuration for ZooKeeper                                                | Check `values.yaml` file       |
 | `readinessProbe`                     | Readiness probe configuration for ZooKeeper                                               | Check `values.yaml` file       |
+| `customLivenessProbe`                | Override default liveness probe                                                           | `nil`                          |
+| `customReadinessProbe`               | Override default readiness probe                                                          | `nil`                          |
 | `extraVolumes`                       | Extra volumes                                                                             | `nil`                          |
 | `extraVolumeMounts`                  | Mount extra volume(s)                                                                     | `nil`                          |
 | `initContainers`                     | Extra init container to add to the statefulset                                            | `nil`                          |
diff --git a/bitnami/zookeeper/templates/statefulset.yaml b/bitnami/zookeeper/templates/statefulset.yaml
index 36e650e14..0e4548a92 100644
--- a/bitnami/zookeeper/templates/statefulset.yaml
+++ b/bitnami/zookeeper/templates/statefulset.yaml
@@ -264,6 +264,8 @@ spec:
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
             successThreshold: {{ .Values.livenessProbe.successThreshold }}
             failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- else if .Values.customLivenessProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
@@ -282,6 +284,8 @@ spec:
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
             successThreshold: {{ .Values.readinessProbe.successThreshold }}
             failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- else if .Values.customReadinessProbe }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }}
           {{- end }}
           volumeMounts:
             - name: data
diff --git a/bitnami/zookeeper/values.yaml b/bitnami/zookeeper/values.yaml
index 1dc6e1fa2..723a21902 100644
--- a/bitnami/zookeeper/values.yaml
+++ b/bitnami/zookeeper/values.yaml
@@ -408,6 +408,14 @@ readinessProbe:
   successThreshold: 1
   probeCommandTimeout: 2
 
+## Custom Liveness probes for ZooKeeper
+##
+customLivenessProbe: {}
+
+## Custom Readiness probes for ZooKeeper
+##
+customReadinessProbe: {}
+
 ## Network policies
 ## Ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
 ##