use cluster values

charts/postgres-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 3.20.4
+version: 3.20.7
 description: Chart for cloudnative-pg cluster
 keywords:
   - database

charts/postgres-cluster/templates/_bootstrap.tpl

@@ -37,7 +37,10 @@ bootstrap:
     {{- end }}
 {{- else if eq .Values.mode "replica" }}
   initdb:
-    database: {{ .Values.replica.importDatabaseName }}
+    {{- with .Values.cluster.initdb }}
+    {{- with (omit . "postInitApplicationSQL") }}
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
     import:
       type: {{ .Values.replica.importType }}
       databases:

charts/postgres-cluster/templates/cluster.yaml

@@ -60,4 +60,5 @@ spec:
     enablePodMonitor: {{ and .Values.cluster.monitoring.enabled .Values.cluster.monitoring.podMonitor.enabled }}
 
   {{ include "cluster.bootstrap" . | nindent 2 }}
+
   {{ include "cluster.backup" . | nindent 2 }}

charts/postgres-cluster/values.yaml

@@ -139,9 +139,6 @@ replica:
   importDatabases:
     - app
 
-  # If type microservice select the name for the imported database.
-  importDatabaseName: app
-
   # If type microservice no roles are imported and ignored
   importRoles: []