From 39aba2e8d3544889024097adb3601b601010ce3a Mon Sep 17 00:00:00 2001
From: Alex Murphy <alex.murphy@powerhrg.com>
Date: Thu, 11 May 2023 15:21:59 -0400
Subject: [PATCH] Moves init-sql-cm.yaml along with other config

- Moving init-sql-cm.yaml
- Updating the values files with additional options
- Bumps version to 5.3.1-1
---
 charts/crunchydata-pgo-db/Chart.yaml                      | 2 +-
 .../templates/init-sql-cm.yaml                            | 0
 charts/crunchydata-pgo-db/values.yaml                     | 4 ++++
 charts/crunchydata-pgo/values.yaml                        | 8 --------
 4 files changed, 5 insertions(+), 9 deletions(-)
 rename charts/{crunchydata-pgo => crunchydata-pgo-db}/templates/init-sql-cm.yaml (100%)

diff --git a/charts/crunchydata-pgo-db/Chart.yaml b/charts/crunchydata-pgo-db/Chart.yaml
index e9bf700..d078a1c 100644
--- a/charts/crunchydata-pgo-db/Chart.yaml
+++ b/charts/crunchydata-pgo-db/Chart.yaml
@@ -3,5 +3,5 @@ name: crunchydata-pgo-db
 description: Installer for PGO, the open source Postgres Operator from Crunchy Data
 type: application
 # The version below should match the version on the PostgresCluster CRD
-version: 5.3.1
+version: 5.3.1-1
 appVersion: 5.3.1
diff --git a/charts/crunchydata-pgo/templates/init-sql-cm.yaml b/charts/crunchydata-pgo-db/templates/init-sql-cm.yaml
similarity index 100%
rename from charts/crunchydata-pgo/templates/init-sql-cm.yaml
rename to charts/crunchydata-pgo-db/templates/init-sql-cm.yaml
diff --git a/charts/crunchydata-pgo-db/values.yaml b/charts/crunchydata-pgo-db/values.yaml
index 1924c38..b1515e1 100644
--- a/charts/crunchydata-pgo-db/values.yaml
+++ b/charts/crunchydata-pgo-db/values.yaml
@@ -154,6 +154,10 @@ postgresVersion: 15
 # databaseInitSQL:
 #   name: bootstrap-sql
 #   key: bootstrap.sql
+# # If you specify the content key the chart will create a ConfigMap.
+#   content: |-
+#     \c awx
+#     GRANT CREATE ON SCHEMA public TO "awx";
 
 # standby sets whether or not to run this as a standby cluster. Setting "enabled" to
 # "true" eunables the standby cluster while "repoName" points to a pgBackRest
diff --git a/charts/crunchydata-pgo/values.yaml b/charts/crunchydata-pgo/values.yaml
index d5495bb..5dea603 100644
--- a/charts/crunchydata-pgo/values.yaml
+++ b/charts/crunchydata-pgo/values.yaml
@@ -58,11 +58,3 @@ resources:
   controller: {}
   upgrade: {}
 
-# On database creation, the init script will be run.
-# databaseInitSQL:
-#   name: init-sql
-#   key: init.sql
-# # If you specify the content key the chart will create a ConfigMap.
-#   content: |-
-#     \c awx
-#     GRANT CREATE ON SCHEMA public TO "awx";