change condition handling

charts/postgres-cluster/Chart.yaml

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

charts/postgres-cluster/templates/_backup.tpl

@@ -25,8 +25,8 @@ backup:
       {{- if .Values.backup.wal.encryption }}
       encryption: {{ .Values.backup.wal.encryption }}
       {{- end }}
-      {{- if .Values.backup.wal.jobs }}
+      {{- if .Values.backup.wal.maxParallel }}
-      jobs: {{ .Values.backup.wal.jobs }}
+      maxParallel: {{ .Values.backup.wal.maxParallel }}
       {{- end }}
     data:
       {{- if .Values.backup.data.compression }}

charts/postgres-cluster/templates/_bootstrap.tpl

@@ -7,6 +7,7 @@ bootstrap:
     {{- . | toYaml | nindent 4 }}
     {{- end }}
     {{- end }}
+    {{- if or (eq .Values.type "postgis") (eq .Values.type "timescaledb") (.Values.cluster.initdb.postInitApplicationSQL) }}
     postInitApplicationSQL:
       {{- if eq .Values.type "postgis" }}
       - CREATE EXTENSION IF NOT EXISTS postgis;
@@ -21,6 +22,7 @@ bootstrap:
       {{- printf "- %s" . | nindent 6 }}
       {{- end }}
       {{- end }}
+    {{- end }}      
 {{- else if eq .Values.mode "replica" }}
   initdb:
     import:
@@ -94,8 +96,8 @@ externalClusters:
         {{- if .Values.recovery.data.encryption }}
         encryption: {{ .Values.recovery.data.encryption }}
         {{- end }}
-        {{- if .Values.recovery.data.maxParallel }}
+        {{- if .Values.recovery.data.jobs }}
-        maxParallel: {{ .Values.recovery.data.maxParallel }}
+        jobs: {{ .Values.recovery.data.jobs }}
         {{- end }}
 {{- else }}
   {{ fail "Invalid cluster mode!" }}

charts/postgres-cluster/values.yaml

@@ -125,7 +125,7 @@ recovery:
     # Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`.
     encryption: ""
     # Number of data files to be archived or restored in parallel.
-    maxParallel: 2
+    jobs: 2
 
 replica:
   # See https://cloudnative-pg.io/documentation/current/database_import/
@@ -180,7 +180,7 @@ backup:
     # Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`.
     encryption: ""
     # Number of WAL files to be archived or restored in parallel.
-    jobs: 2
+    maxParallel: 2
   data:
     # Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
     compression: snappy