From af7b472e42a6ddc6ea1a7ca927a921c9534dff9e Mon Sep 17 00:00:00 2001
From: Alexander Makarenko <estliberitas@gmail.com>
Date: Tue, 14 Jan 2020 13:06:18 +0100
Subject: [PATCH] Support setting of Pgpool Load-Balancing mode

---
 bitnami/postgresql-ha/Chart.yaml                       | 2 +-
 bitnami/postgresql-ha/README.md                        | 1 +
 bitnami/postgresql-ha/templates/pgpool/deployment.yaml | 2 ++
 bitnami/postgresql-ha/values-production.yaml           | 4 ++++
 bitnami/postgresql-ha/values.yaml                      | 4 ++++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/bitnami/postgresql-ha/Chart.yaml b/bitnami/postgresql-ha/Chart.yaml
index 32537eb7b..4183eff6d 100644
--- a/bitnami/postgresql-ha/Chart.yaml
+++ b/bitnami/postgresql-ha/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: postgresql-ha
-version: 1.2.1
+version: 1.3.0
 appVersion: 11.6.0
 description: Chart for PostgreSQL with HA architecture (using Replication Manager (repmgr) and Pgpool).
 keywords:
diff --git a/bitnami/postgresql-ha/README.md b/bitnami/postgresql-ha/README.md
index adb882b2e..8379a9e38 100644
--- a/bitnami/postgresql-ha/README.md
+++ b/bitnami/postgresql-ha/README.md
@@ -132,6 +132,7 @@ The following table lists the configurable parameters of the PostgreSQL HA chart
 | `pgpool.adminPassword`                         | Pgpool Admin password                                                                                                                                                | `nil`                                                        |
 | `pgpool.configuration`                         | Content of pgpool.conf                                                                                                                                               | `nil`                                                        |
 | `pgpool.configurationCM`                       | ConfigMap with the Pgpool configuration file (Note: Overrides `pgpol.configuration`)                                                                                 | `nil` (The value is evaluated as a template)                 |
+| `pgpool.useLoadBalancing`                      | If true, use Pgpool Load-Balancing                                                                                                                                   | `true`                                                        |
 | **LDAP**                                       |                                                                                                                                                                      |                                                              |
 | `ldap.enabled`                                 | Enable LDAP support                                                                                                                                                  | `false`                                                      |
 | `ldap.existingSecret`                          | Name of existing secret to use for LDAP passwords                                                                                                                    | `nil`                                                        |
diff --git a/bitnami/postgresql-ha/templates/pgpool/deployment.yaml b/bitnami/postgresql-ha/templates/pgpool/deployment.yaml
index 014f6a7db..452032cde 100644
--- a/bitnami/postgresql-ha/templates/pgpool/deployment.yaml
+++ b/bitnami/postgresql-ha/templates/pgpool/deployment.yaml
@@ -105,6 +105,8 @@ spec:
                   name: {{ include "postgresql-ha.postgresqlSecretName" . }}
                   key: repmgr-password
             {{- end }}
+            - name: PGPOOL_ENABLE_LOAD_BALANCING
+              value: {{ ternary "yes" "no" .Values.pgpool.useLoadBalancing | quote }}
             - name: PGPOOL_ENABLE_LDAP
               value: {{ ternary "yes" "no" .Values.ldap.enabled | quote }}
             {{- if .Values.ldap.enabled }}
diff --git a/bitnami/postgresql-ha/values-production.yaml b/bitnami/postgresql-ha/values-production.yaml
index d545f7bc2..5f2fd0163 100644
--- a/bitnami/postgresql-ha/values-production.yaml
+++ b/bitnami/postgresql-ha/values-production.yaml
@@ -376,6 +376,10 @@ pgpool:
   ##
   # configurationCM:
 
+  ## Use Pgpool Load-Balancing
+  ##
+  useLoadBalancing: true
+
 ## LDAP parameters
 ##
 ldap:
diff --git a/bitnami/postgresql-ha/values.yaml b/bitnami/postgresql-ha/values.yaml
index 71e99cfa0..658e2b69d 100644
--- a/bitnami/postgresql-ha/values.yaml
+++ b/bitnami/postgresql-ha/values.yaml
@@ -376,6 +376,10 @@ pgpool:
   ##
   # configurationCM:
 
+  ## Use Pgpool Load-Balancing
+  ##
+  useLoadBalancing: true
+
 ## LDAP parameters
 ##
 ldap: