fix backup fields

charts/postgres-cluster/Chart.yaml

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

charts/postgres-cluster/templates/_backup.tpl

@@ -19,12 +19,24 @@ backup:
         name: {{ include "cluster.backupCredentials" . }}
         key: ACCESS_SECRET_KEY
     wal:
+      {{- if .Values.backup.wal.compression }}
       compression: {{ .Values.backup.wal.compression }}
+      {{- end }}
+      {{- if .Values.backup.wal.encryption }}
       encryption: {{ .Values.backup.wal.encryption }}
-      maxParallel: {{ .Values.backup.wal.maxParallel }}
+      {{- end }}
+      {{- if .Values.backup.wal.jobs }}
+      jobs: {{ .Values.backup.wal.jobs }}
+      {{- end }}
     data:
+      {{- if .Values.backup.data.compression }}
       compression: {{ .Values.backup.data.compression }}
+      {{- end }}
+      {{- if .Values.backup.data.encryption }}
       encryption: {{ .Values.backup.data.encryption }}
+      {{- end }}
+      {{- if .Values.backup.data.jobs }}
       jobs: {{ .Values.backup.data.jobs }}
+      {{- end }}
 {{- end }}
 {{- end }}

charts/postgres-cluster/templates/_bootstrap.tpl

@@ -78,13 +78,25 @@ externalClusters:
           name: {{ include "cluster.recoveryCredentials" . }}
           key: ACCESS_SECRET_KEY
       wal:
+        {{- if .Values.recovery.wal.compression }}
         compression: {{ .Values.recovery.wal.compression }}
+        {{- end }}
+        {{- if .Values.recovery.wal.encryption }}
         encryption: {{ .Values.recovery.wal.encryption }}
+        {{- end }}
+        {{- if .Values.recovery.wal.maxParallel }}
         maxParallel: {{ .Values.recovery.wal.maxParallel }}
+        {{- end }}
       data:
+        {{- if .Values.recovery.data.compression }}
         compression: {{ .Values.recovery.data.compression }}
+        {{- end }}
+        {{- if .Values.recovery.data.encryption }}
         encryption: {{ .Values.recovery.data.encryption }}
-        jobs: {{ .Values.recovery.data.jobs }}
+        {{- end }}
+        {{- if .Values.recovery.data.maxParallel }}
+        maxParallel: {{ .Values.recovery.data.maxParallel }}
+        {{- end }}
 {{- else }}
   {{ fail "Invalid cluster mode!" }}
 {{- end }}

charts/postgres-cluster/templates/cluster.yaml

@@ -32,15 +32,17 @@ spec:
   affinity:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- if .Values.cluster.priorityClassName }}
   priorityClassName: {{ .Values.cluster.priorityClassName }}
+  {{- end }}
   primaryUpdateMethod: {{ .Values.cluster.primaryUpdateMethod }}
   primaryUpdateStrategy: {{ .Values.cluster.primaryUpdateStrategy }}
   logLevel: {{ .Values.cluster.logLevel }}
   postgresql:
+    {{- if eq .Values.type "timescaledb" }}
     shared_preload_libraries:
-      {{- if eq .Values.type "timescaledb" }}
       - timescaledb
-      {{- end }}
+    {{- end }}
     {{- with .Values.cluster.postgresql.parameters }}
     parameters:
       {{- toYaml . | nindent 6 }}

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.
-    jobs: 2
+    maxParallel: 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.
-    maxParallel: 2
+    jobs: 2
   data:
     # Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
     compression: snappy