change values handling in backup

charts/postgres-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 6.1.0
+version: 6.2.0
 description: Cloudnative-pg Cluster
 keywords:
   - database

charts/postgres-cluster/README.md

@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![Version: 6.1.0](https://img.shields.io/badge/Version-6.1.0-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
+![Version: 6.2.0](https://img.shields.io/badge/Version-6.2.0-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
 
 Cloudnative-pg Cluster
 
@@ -19,27 +19,10 @@ Cloudnative-pg Cluster
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| backup | object | `{"enabled":true,"method":"objectStore","objectStore":[{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"destinationPath":"s3://postgres-backups","endpointCA":{"create":false,"enabled":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"https://nyc3.digitaloceanspaces.com","index":1,"isWALArchiver":true,"name":"external","retentionPolicy":"30d","wal":{"compression":"snappy","encryption":"","maxParallel":1}}],"scheduledBackups":[{"backupName":"external","backupOwnerReference":"self","name":"daily-backup","plugin":"barman-cloud.cloudnative-pg.io","schedule":"0 0 */3 * *","suspend":false}]}` | Backup settings |
+| backup | object | `{"enabled":true,"method":"objectStore","objectStore":[],"scheduledBackups":[{"backupName":"external","backupOwnerReference":"self","name":"daily-backup","plugin":"barman-cloud.cloudnative-pg.io","schedule":"0 0 */3 * *","suspend":false}]}` | Backup settings |
 | backup.enabled | bool | `true` | You need to configure backups manually, so backups are disabled by default. |
 | backup.method | string | `"objectStore"` | Method to create backups, options currently are only objectStore |
-| backup.objectStore | list | `[{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"destinationPath":"s3://postgres-backups","endpointCA":{"create":false,"enabled":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"https://nyc3.digitaloceanspaces.com","index":1,"isWALArchiver":true,"name":"external","retentionPolicy":"30d","wal":{"compression":"snappy","encryption":"","maxParallel":1}}]` | Options for object store backups |
+| backup.objectStore | list | `[]` | Options for object store backups |
-| backup.objectStore[0].clusterName | string | `""` | Override the name of the backup cluster, defaults to "cluster.name" |
-| backup.objectStore[0].data.compression | string | `"snappy"` | Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. |
-| backup.objectStore[0].data.encryption | string | `""` | Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`. |
-| backup.objectStore[0].data.jobs | int | `1` | Number of data files to be archived or restored in parallel. |
-| backup.objectStore[0].destinationPath | string | `"s3://postgres-backups"` | Overrides the provider specific default path. Defaults to: S3: s3://<bucket><path> Azure: https://<storageAccount>.<serviceName>.core.windows.net/<containerName><path> Google: gs://<bucket><path> |
-| backup.objectStore[0].endpointCA | object | `{"create":false,"enabled":false,"key":"","name":""}` | Specifies a CA bundle to validate a privately signed certificate. |
-| backup.objectStore[0].endpointCA.create | bool | `false` | Creates a secret with the given value if true, otherwise uses an existing secret. |
-| backup.objectStore[0].endpointCredentials | string | `""` | Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY |
-| backup.objectStore[0].endpointURL | string | `"https://nyc3.digitaloceanspaces.com"` | Overrides the provider specific default endpoint. Defaults to: S3: https://s3.<region>.amazonaws.com" |
-| backup.objectStore[0].index | int | `1` | Generate external cluster name, uses: {{ .Release.Name }}-postgresql-<major version>-backup-index-{{ index }} |
-| backup.objectStore[0].isWALArchiver | bool | `true` | Specificies if this backup will do WALs |
-| backup.objectStore[0].name | string | `"external"` | Object store backup name |
-| backup.objectStore[0].retentionPolicy | string | `"30d"` | Retention policy for backups |
-| backup.objectStore[0].wal | object | `{"compression":"snappy","encryption":"","maxParallel":1}` | Storage |
-| backup.objectStore[0].wal.compression | string | `"snappy"` | WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. |
-| backup.objectStore[0].wal.encryption | string | `""` | Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`. |
-| backup.objectStore[0].wal.maxParallel | int | `1` | Number of WAL files to be archived or restored in parallel. |
 | backup.scheduledBackups[0].backupName | string | `"external"` | Name of backup target |
 | backup.scheduledBackups[0].backupOwnerReference | string | `"self"` | Backup owner reference |
 | backup.scheduledBackups[0].name | string | `"daily-backup"` | Scheduled backup name |
@@ -85,7 +68,7 @@ Cloudnative-pg Cluster
 | nameOverride | string | `""` | Override the name of the cluster |
 | namespaceOverride | string | `""` | Override the namespace of the chart |
 | poolers | list | `[]` | List of PgBouncer poolers |
-| recovery | object | `{"backup":{"backupName":"","database":"app","owner":"","pitrTarget":{"time":""}},"import":{"databases":[],"pgDumpExtraOptions":[],"pgRestoreExtraOptions":[],"postImportApplicationSQL":[],"roles":[],"schemaOnly":false,"source":{"database":"app","host":"","passwordSecret":{"create":false,"key":"password","name":"","value":""},"port":5432,"sslCertSecret":{"key":"","name":""},"sslKeySecret":{"key":"","name":""},"sslMode":"verify-full","sslRootCertSecret":{"key":"","name":""},"username":"app"},"type":"microservice"},"method":"backup","objectStore":{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"database":"app","destinationPath":"","endpointCA":{"create":false,"enabled":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"","index":1,"name":"recovery","owner":"","pitrTarget":{"time":""},"wal":{"compression":"snappy","encryption":"","maxParallel":1}},"pgBaseBackup":{"database":"app","owner":"","secret":"","source":{"database":"app","host":"","passwordSecret":{"create":false,"key":"password","name":"","value":""},"port":5432,"sslCertSecret":{"key":"","name":""},"sslKeySecret":{"key":"","name":""},"sslMode":"verify-full","sslRootCertSecret":{"key":"","name":""},"username":""}}}` | Recovery settings when booting cluster from external cluster |
+| recovery | object | `{"backup":{"backupName":"","database":"app","owner":"","pitrTarget":{"time":""}},"import":{"databases":[],"pgDumpExtraOptions":[],"pgRestoreExtraOptions":[],"postImportApplicationSQL":[],"roles":[],"schemaOnly":false,"source":{"database":"app","host":"","passwordSecret":{"create":false,"key":"password","name":"","value":""},"port":5432,"sslCertSecret":{"key":"","name":""},"sslKeySecret":{"key":"","name":""},"sslMode":"verify-full","sslRootCertSecret":{"key":"","name":""},"username":"app"},"type":"microservice"},"method":"backup","objectStore":{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"database":"app","destinationPath":"","endpointCA":{"create":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"","index":1,"name":"recovery","owner":"","pitrTarget":{"time":""},"wal":{"compression":"snappy","encryption":"","maxParallel":1}},"pgBaseBackup":{"database":"app","owner":"","secret":"","source":{"database":"app","host":"","passwordSecret":{"create":false,"key":"password","name":"","value":""},"port":5432,"sslCertSecret":{"key":"","name":""},"sslKeySecret":{"key":"","name":""},"sslMode":"verify-full","sslRootCertSecret":{"key":"","name":""},"username":""}}}` | Recovery settings when booting cluster from external cluster |
 | recovery.backup.backupName | string | `""` | Name of the backup to recover from. |
 | recovery.backup.database | string | `"app"` | Name of the database used by the application. Default: `app`. |
 | recovery.backup.owner | string | `""` | Name of the owner of the database in the instance to be used by applications. Defaults to the value of the `database` key. |
@@ -110,7 +93,7 @@ Cloudnative-pg Cluster
 | recovery.objectStore.data.jobs | int | `1` | Number of data files to be archived or restored in parallel. |
 | recovery.objectStore.database | string | `"app"` | Name of the database used by the application. Default: `app`. |
 | recovery.objectStore.destinationPath | string | `""` | Overrides the provider specific default path. Defaults to: S3: s3://<bucket><path> Azure: https://<storageAccount>.<serviceName>.core.windows.net/<containerName><path> Google: gs://<bucket><path> |
-| recovery.objectStore.endpointCA | object | `{"create":false,"enabled":false,"key":"","name":""}` | Specifies a CA bundle to validate a privately signed certificate. |
+| recovery.objectStore.endpointCA | object | `{"create":false,"key":"","name":""}` | Specifies a CA bundle to validate a privately signed certificate. |
 | recovery.objectStore.endpointCA.create | bool | `false` | Creates a secret with the given value if true, otherwise uses an existing secret. |
 | recovery.objectStore.endpointCredentials | string | `""` | Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY |
 | recovery.objectStore.endpointURL | string | `""` | Overrides the provider specific default endpoint. Defaults to: S3: https://s3.<region>.amazonaws.com" Leave empty if using the default S3 endpoint |

charts/postgres-cluster/templates/object-store.yaml

@@ -10,35 +10,39 @@ metadata:
   labels:
     {{- include "cluster.labels" $context | nindent 4 }}
 spec:
-  retentionPolicy: {{ .retentionPolicy }}
+  retentionPolicy: {{ .retentionPolicy | default "30d" }}
   configuration:
-    destinationPath: {{ .destinationPath }}
+    destinationPath: {{ .destinationPath | required "Destination path is required" }}
-    endpointURL: {{ .endpointURL }}
+    endpointURL: {{ .endpointURL | default "https://nyc3.digitaloceanspaces.com" }}
-    {{ if .endpointCA.enabled }}
+    {{- if .endpointCA }}
     endpointCA:
       name: {{ .endpointCA.name }}
       key: {{ .endpointCA.key }}
-    {{ end }}
+    {{- end }}
     {{- if .clusterName }}
     serverName: "{{ .clusterName }}-backup-{{ .index }}"
     {{- else }}
     serverName: "{{ include "cluster.name" $context }}-backup-{{ .index }}"
     {{- end }}
+    {{- if .wal }}
     wal:
-      compression: {{ .wal.compression }}
+      compression: {{ .wal.compression | default "snappy" }}
-      {{- with .wal.encryption}}
+      {{- with .wal.encryption }}
       encryption: {{ . }}
       {{- end }}
-      maxParallel: {{ .wal.maxParallel }}
+      maxParallel: {{ .wal.maxParallel | default 1 }}
+    {{- end }}
+    {{- if .wal }}
     data:
-      compression: {{ .data.compression }}
+      compression: {{ .data.compression | default "snappy"  }}
       {{- with .data.encryption }}
       encryption: {{ . }}
       {{- end }}
-      jobs: {{ .data.jobs }}
+      jobs: {{ .data.jobs | default 1 }}
+    {{- end }}
     s3Credentials:
       accessKeyId:
-        {{- if not (empty .endpointCredentials) }}
+        {{- if .endpointCredentials }}
         name: {{ .endpointCredentials }}
         {{- else }}
         name: {{- printf "%s-backup-secret" (include "cluster.name" $context) | trunc 63 | trimSuffix "-" -}}
@@ -67,7 +71,7 @@ spec:
   configuration:
     destinationPath: {{ .Values.recovery.objectStore.destinationPath }}
     endpointURL: {{ .Values.recovery.objectStore.endpointURL }}
-    {{- if .Values.recovery.objectStore.endpointCA.enabled }}
+    {{- if .Values.recovery.objectStore.endpointCA.name }}
     endpointCA:
       name: {{ .Values.recovery.objectStore.endpointCA.name }}
       key: {{ .Values.recovery.objectStore.endpointCA.key }}

charts/postgres-cluster/values.yaml

@@ -275,8 +275,6 @@ recovery:
 
     # -- Specifies a CA bundle to validate a privately signed certificate.
     endpointCA:
-      enabled: false
-
       # -- Creates a secret with the given value if true, otherwise uses an existing secret.
       create: false
 
@@ -426,67 +424,66 @@ backup:
   method: objectStore
 
   # -- Options for object store backups
-  objectStore:
+  objectStore: []
-    -
-      # -- Object store backup name
-      name: external
 
-      # -- Overrides the provider specific default path. Defaults to:
+    # -
-      # S3: s3://<bucket><path>
+    #   # -- Object store backup name
-      # Azure: https://<storageAccount>.<serviceName>.core.windows.net/<containerName><path>
+    #   name: external
-      # Google: gs://<bucket><path>
-      destinationPath: s3://postgres-backups
 
-      # -- Overrides the provider specific default endpoint. Defaults to:
+    #   # -- Overrides the provider specific default path. Defaults to:
-      # S3: https://s3.<region>.amazonaws.com"
+    #   # S3: s3://<bucket><path>
-      endpointURL: https://nyc3.digitaloceanspaces.com
+    #   # Azure: https://<storageAccount>.<serviceName>.core.windows.net/<containerName><path>
+    #   # Google: gs://<bucket><path>
+    #   destinationPath: ""
 
-      # -- Specifies a CA bundle to validate a privately signed certificate.
+    #   # -- Overrides the provider specific default endpoint. Defaults to:
-      endpointCA:
+    #   # https://nyc3.digitaloceanspaces.com
-        enabled: false
+    #   endpointURL: ""
 
-        # -- Creates a secret with the given value if true, otherwise uses an existing secret.
+    #   # -- Specifies a CA bundle to validate a privately signed certificate.
-        create: false
+    #   endpointCA:
+    #     # -- Creates a secret with the given value if true, otherwise uses an existing secret.
+    #     create: false
 
-        name: ""
+    #     name: ""
-        key: ""
+    #     key: ""
 
-      # -- Generate external cluster name, uses: {{ .Release.Name }}-postgresql-<major version>-backup-index-{{ index }}
+    #   # -- Generate external cluster name, uses: {{ .Release.Name }}-postgresql-<major version>-backup-index-{{ index }}
-      index: 1
+    #   index: 1
 
-      # -- Override the name of the backup cluster, defaults to "cluster.name"
+    #   # -- Override the name of the backup cluster, defaults to "cluster.name"
-      clusterName: ""
+    #   clusterName: ""
 
-      # -- Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY
+    #   # -- Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY
-      endpointCredentials: ""
+    #   endpointCredentials: ""
 
-      # -- Retention policy for backups
+    #   # -- Retention policy for backups
-      retentionPolicy: "30d"
+    #   retentionPolicy: "30d"
 
-      # -- Specificies if this backup will do WALs
+    #   # -- Specificies if this backup will do WALs
-      isWALArchiver: true
+    #   isWALArchiver: true
 
-      # -- Storage
+    #   # -- Storage
-      wal:
+    #   wal:
 
-        # -- WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
+    #     # -- WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
-        compression: snappy
+    #     compression: snappy
 
-        # -- Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`.
+    #     # -- Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`.
-        encryption: ""
+    #     encryption: ""
 
-        # -- Number of WAL files to be archived or restored in parallel.
+    #     # -- Number of WAL files to be archived or restored in parallel.
-        maxParallel: 1
+    #     maxParallel: 1
 
-      data:
+    #   data:
-        # -- Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
+    #     # -- Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
-        compression: snappy
+    #     compression: snappy
 
-        # -- Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`.
+    #     # -- Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`.
-        encryption: ""
+    #     encryption: ""
 
-        # -- Number of data files to be archived or restored in parallel.
+    #     # -- Number of data files to be archived or restored in parallel.
-        jobs: 1
+    #     jobs: 1
 
   scheduledBackups:
     -