use cluster values

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

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 }}

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: []