From ffc6457b41adef3cdf1a5f1e29bf0bd176cd2bde Mon Sep 17 00:00:00 2001
From: Gregory Moyer <moyerg@syphr.com>
Date: Mon, 26 Apr 2021 12:05:24 -0400
Subject: [PATCH] [postgresql-ha] remove ldap requirement for probes (#6208)

---
 bitnami/postgresql-ha/Chart.yaml                       | 2 +-
 bitnami/postgresql-ha/templates/pgpool/deployment.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bitnami/postgresql-ha/Chart.yaml b/bitnami/postgresql-ha/Chart.yaml
index 7667b3888..54a6e19dd 100644
--- a/bitnami/postgresql-ha/Chart.yaml
+++ b/bitnami/postgresql-ha/Chart.yaml
@@ -27,4 +27,4 @@ name: postgresql-ha
 sources:
   - https://github.com/bitnami/bitnami-docker-postgresql
   - https://www.postgresql.org/
-version: 6.9.1
+version: 7.0.0
diff --git a/bitnami/postgresql-ha/templates/pgpool/deployment.yaml b/bitnami/postgresql-ha/templates/pgpool/deployment.yaml
index 3a91eb181..c48caea9b 100644
--- a/bitnami/postgresql-ha/templates/pgpool/deployment.yaml
+++ b/bitnami/postgresql-ha/templates/pgpool/deployment.yaml
@@ -272,7 +272,7 @@ spec:
             - name: postgresql
               containerPort: 5432
               protocol: TCP
-          {{- if and .Values.pgpool.livenessProbe.enabled (not .Values.ldap.enabled) }}
+          {{- if .Values.pgpool.livenessProbe.enabled }}
           livenessProbe:
             exec:
               command:
@@ -285,7 +285,7 @@ spec:
           {{- else if .Values.pgpool.customLivenessProbe }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.pgpool.customLivenessProbe "context" $) | nindent 12 }}
           {{- end }}
-          {{- if and .Values.pgpool.readinessProbe.enabled (not .Values.ldap.enabled) }}
+          {{- if .Values.pgpool.readinessProbe.enabled }}
           readinessProbe:
             exec:
               command:
@@ -300,7 +300,7 @@ spec:
           {{- else if .Values.pgpool.customReadinessProbe }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.pgpool.customReadinessProbe "context" $) | nindent 12 }}
           {{- end }}
-          {{- if and .Values.pgpool.startupProbe.enabled (not .Values.ldap.enabled) }}
+          {{- if .Values.pgpool.startupProbe.enabled }}
           startupProbe:
             exec:
               command: