Merge branch 'main' into grafana-dashboard-chart-0.2

cloudnative-pg · Apr 26, 2024 · 6402c2e · 6402c2e
2 parents cf8eff3 + ec214c4
commit 6402c2e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/charts/cluster/README.md b/charts/cluster/README.md
@@ -140,6 +140,7 @@ refer to  the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
 | backups.s3.region | string | `""` |  |
 | backups.s3.secretKey | string | `""` |  |
 | backups.scheduledBackups[0].backupOwnerReference | string | `"self"` | Backup owner reference |
+| backups.scheduledBackups[0].method | string | `"barmanObjectStore"` | Backup method, can be `barmanObjectStore` (default) or `volumeSnapshot` |
 | backups.scheduledBackups[0].name | string | `"daily-backup"` | Scheduled backup name |
 | backups.scheduledBackups[0].schedule | string | `"0 0 0 * * *"` | Schedule in cron format |
 | backups.wal.compression | string | `"gzip"` | WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. |

diff --git a/charts/cluster/templates/scheduled-backups.yaml b/charts/cluster/templates/scheduled-backups.yaml
@@ -10,6 +10,7 @@ metadata:
 spec:
   immediate: true
   schedule: {{ .schedule }}
+  method: {{ .method }}
   backupOwnerReference: {{ .backupOwnerReference }}
   cluster:
     name: {{ include "cluster.fullname" $context }}

diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json
@@ -125,6 +125,9 @@
                             "backupOwnerReference": {
                                 "type": "string"
                             },
+                            "method": {
+                                "type": "string"
+                            },
                             "name": {
                                 "type": "string"
                             },

diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
@@ -266,6 +266,8 @@ backups:
       schedule: "0 0 0 * * *"
       # -- Backup owner reference
       backupOwnerReference: self
+      # -- Backup method, can be `barmanObjectStore` (default) or `volumeSnapshot`
+      method: barmanObjectStore
 
   # -- Retention policy for backups
   retentionPolicy: "30d"