From 275fcd8568c0445ff9326314b9834b249b2c9f7c Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Sat, 21 Dec 2024 23:26:40 -0600
Subject: [PATCH] use cluster values

---
 charts/postgres-cluster/Chart.yaml               | 2 +-
 charts/postgres-cluster/templates/_bootstrap.tpl | 8 +++-----
 charts/postgres-cluster/values.yaml              | 6 ------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/charts/postgres-cluster/Chart.yaml b/charts/postgres-cluster/Chart.yaml
index b5fe347..f562d65 100644
--- a/charts/postgres-cluster/Chart.yaml
+++ b/charts/postgres-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 3.20.6
+version: 3.20.7
 description: Chart for cloudnative-pg cluster
 keywords:
   - database
diff --git a/charts/postgres-cluster/templates/_bootstrap.tpl b/charts/postgres-cluster/templates/_bootstrap.tpl
index baa9950..6b26c9b 100644
--- a/charts/postgres-cluster/templates/_bootstrap.tpl
+++ b/charts/postgres-cluster/templates/_bootstrap.tpl
@@ -37,11 +37,9 @@ bootstrap:
     {{- end }}
 {{- else if eq .Values.mode "replica" }}
   initdb:
-    {{- with .Values.replica.importDatabaseName }}
-    database: {{ . }}
-    {{- end }}
-    {{- with .Values.replica.importOwner }}
-    owner: {{ . }}
+    {{- with .Values.cluster.initdb }}
+    {{- with (omit . "postInitApplicationSQL") }}
+    {{- . | toYaml | nindent 4 }}
     {{- end }}
     import:
       type: {{ .Values.replica.importType }}
diff --git a/charts/postgres-cluster/values.yaml b/charts/postgres-cluster/values.yaml
index af2a3af..c70cb60 100644
--- a/charts/postgres-cluster/values.yaml
+++ b/charts/postgres-cluster/values.yaml
@@ -139,12 +139,6 @@ replica:
   importDatabases:
     - app
 
-  # If type microservice select the name for the imported database.
-  importDatabaseName: app
-
-  # If type microservice select the name for the database owner.
-  importOwner: app
-
   # If type microservice no roles are imported and ignored
   importRoles: []