From 29c9bbb4bfec04ab22761cc2d999eb0fcb8acbed Mon Sep 17 00:00:00 2001
From: pat-s <patrick.schratz@gmail.com>
Date: Tue, 18 Jul 2023 20:06:16 +0200
Subject: [PATCH] postgresql-ha: provide defaults for `postgresPassword` and
 `repmgrPassword` due to upstream bug

---
 README.md   | 18 ++++++++++--------
 values.yaml | 14 ++++++++++----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 108ce97..984312e 100644
--- a/README.md
+++ b/README.md
@@ -841,14 +841,16 @@ kubectl create secret generic gitea-themes --from-file={{FULL-PATH-TO-CSS}} --na
 
 ### PostgreSQL-ha
 
-| Name                                                             | Description                                                          | Value   |
-| ---------------------------------------------------------------- | -------------------------------------------------------------------- | ------- |
-| `postgresql-ha.enabled`                                          | Enable PostgreSQL-ha                                                 | `true`  |
-| `postgresql-ha.global.postgresql-ha.auth.password`               | Password for the `gitea` user (overrides `auth.password`)            | `gitea` |
-| `postgresql-ha.global.postgresql-ha.auth.database`               | Name for a custom database to create (overrides `auth.database`)     | `gitea` |
-| `postgresql-ha.global.postgresql-ha.auth.username`               | Name for a custom user to create (overrides `auth.username`)         | `gitea` |
-| `postgresql-ha.global.postgresql-ha.service.ports.postgresql-ha` | PostgreSQL-ha service port (overrides `service.ports.postgresql-ha`) | `5432`  |
-| `postgresql-ha.primary.persistence.size`                         | PVC Storage Request for PostgreSQL-ha volume                         | `10Gi`  |
+| Name                                               | Description                                                      | Value      |
+| -------------------------------------------------- | ---------------------------------------------------------------- | ---------- |
+| `postgresql-ha.enabled`                            | Enable PostgreSQL-ha                                             | `true`     |
+| `postgresql-ha.global.postgresql.password`         | Password for the `gitea` user (overrides `auth.password`)        | `gitea`    |
+| `postgresql-ha.global.postgresql.database`         | Name for a custom database to create (overrides `auth.database`) | `gitea`    |
+| `postgresql-ha.global.postgresql.username`         | Name for a custom user to create (overrides `auth.username`)     | `gitea`    |
+| `postgresql-ha.global.postgresql.postgresPassword` | Postgres Password                                                | `changeme` |
+| `postgresql-ha.global.postgresql.repmgrPassword`   | Repmgr Password                                                  | `changeme` |
+| `postgresql-ha.service.ports.postgresql`           | PostgreSQL service port (overrides `service.ports.postgresql`)   | `5432`     |
+| `postgresql-ha.primary.persistence.size`           | PVC Storage Request for PostgreSQL-ha volume                     | `10Gi`     |
 
 ### PostgreSQL
 
diff --git a/values.yaml b/values.yaml
index ccd24d2..e2ac2cd 100644
--- a/values.yaml
+++ b/values.yaml
@@ -481,10 +481,12 @@ redis-cluster:
 ## @section postgresql-ha
 #
 ## @param postgresql-ha.enabled Enable postgresql-ha
-## @param postgresql-ha.global.postgresql-ha.auth.password Password for the `gitea` user (overrides `auth.password`)
-## @param postgresql-ha.global.postgresql-ha.auth.database Name for a custom database to create (overrides `auth.database`)
-## @param postgresql-ha.global.postgresql-ha.auth.username Name for a custom user to create (overrides `auth.username`)
-## @param postgresql-ha.global.postgresql-ha.service.ports.postgresql-ha postgresql-ha service port (overrides `service.ports.postgresql-ha`)
+## @param postgresql-ha.global.postgresql.password Password for the `gitea` user (overrides `auth.password`)
+## @param postgresql-ha.global.postgresql.database Name for a custom database to create (overrides `auth.database`)
+## @param postgresql-ha.global.postgresql.username Name for a custom user to create (overrides `auth.username`)
+## @param postgresql-ha.global.postgresql.postgresPassword Postgres Password
+## @param postgresql-ha.global.postgresql.repmgrPassword Repmgr Password
+## @param postgresql-ha.service.ports.postgresql postgresql service port (overrides `service.ports.postgresql`)
 ## @param postgresql-ha.primary.persistence.size PVC Storage Request for postgresql-ha volume
 postgresql-ha:
   enabled: true
@@ -493,6 +495,10 @@ postgresql-ha:
       password: gitea
       database: gitea
       username: gitea
+      # FIXME: https://github.com/bitnami/charts/issues/17052
+      postgresPassword: changeme 
+      # FIXME: https://github.com/bitnami/charts/issues/17052
+      repmgrPassword: changeme 
   service:
     ports:
       postgresql: 5432