remove bool for backups

charts/postgres-cluster/Chart.yaml

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

charts/postgres-cluster/README.md

@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![Version: 6.6.0](https://img.shields.io/badge/Version-6.6.0-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
+![Version: 6.7.0](https://img.shields.io/badge/Version-6.7.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,8 +19,7 @@ Cloudnative-pg Cluster
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| backup | object | `{"enabled":false,"method":"objectStore","objectStore":[],"scheduledBackups":[]}` | Backup settings |
+| backup | object | `{"method":"objectStore","objectStore":[],"scheduledBackups":[]}` | Backup settings |
-| backup.enabled | bool | `false` | 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 | `[]` | Options for object store backups |
 | backup.scheduledBackups | list | `[]` | List of scheduled backups |

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

@@ -1,4 +1,4 @@
-{{ if and (.Values.backup.enabled) (eq .Values.backup.method "objectStore") }}
+{{ if (eq .Values.backup.method "objectStore") }}
 {{ $context := . -}}
 {{ range .Values.backup.objectStore -}}
 ---
@@ -27,7 +27,7 @@ spec:
       {{ end }}
       maxParallel: {{ .wal.maxParallel | default "1" }}
     {{- end }}
-    {{- if .wal }}
+    {{- if .data }}
     data:
       compression: {{ .data.compression | default "snappy"  }}
       {{- with .data.encryption }}
@@ -37,10 +37,10 @@ spec:
     {{- end }}
     s3Credentials:
       accessKeyId:
-        name: {{ .endpointCredentials | default include "cluster.backupCredentials" $context }}
+        name: {{ .endpointCredentials }}
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: {{ .endpointCredentials | default include "cluster.backupCredentials" $context }}
+        name: {{ .endpointCredentials }}
         key: ACCESS_SECRET_KEY
 {{ end -}}
 {{ end }}
@@ -77,9 +77,9 @@ spec:
       jobs: {{ .Values.recovery.objectStore.data.jobs }}
     s3Credentials:
       accessKeyId:
-        name: {{ .Values.recovery.endpointCredentials | default include "cluster.recoveryCredentials" . }}
+        name: {{ .Values.recovery.objectStore.endpointCredentials }}
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: {{ .Values.recovery.endpointCredentials | default include "cluster.recoveryCredentials" . }}
+        name: {{ .Values.recovery.objectStore.endpointCredentials }}
         key: ACCESS_SECRET_KEY
 {{ end }}

charts/postgres-cluster/templates/scheduled-backup.yaml

@@ -1,4 +1,3 @@
-{{ if .Values.backup.enabled }}
 {{ $context := . -}}
 {{ range .Values.backup.scheduledBackups -}}
 ---
@@ -22,4 +21,3 @@ spec:
     parameters:
       barmanObjectName: "{{ include "cluster.name" $context }}-{{ .backupName }}-backup"
 {{ end -}}
-{{ end }}

charts/postgres-cluster/values.yaml

@@ -417,9 +417,6 @@ recovery:
 # -- Backup settings
 backup:
 
-  # -- You need to configure backups manually, so backups are disabled by default.
-  enabled: false
-
   # -- Method to create backups, options currently are only objectStore
   method: objectStore