fix recovery config

charts/generic-device-plugin/README.md

@@ -1,6 +1,6 @@
 # generic-device-plugin
 
-![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square) ![AppVersion: 0.10.0](https://img.shields.io/badge/AppVersion-0.10.0-informational?style=flat-square)
+![Version: 0.12.0](https://img.shields.io/badge/Version-0.12.0-informational?style=flat-square) ![AppVersion: 0.10.0](https://img.shields.io/badge/AppVersion-0.10.0-informational?style=flat-square)
 
 Generic Device Plugin
 
@@ -28,7 +28,7 @@ Generic Device Plugin
 | config | object | `{"data":"devices:\n  - name: serial\n    groups:\n      - paths:\n          - path: /dev/ttyUSB*\n      - paths:\n          - path: /dev/ttyACM*\n      - paths:\n          - path: /dev/tty.usb*\n      - paths:\n          - path: /dev/cu.*\n      - paths:\n          - path: /dev/cuaU*\n      - paths:\n          - path: /dev/rfcomm*\n  - name: video\n    groups:\n      - paths:\n          - path: /dev/video0\n  - name: fuse\n    groups:\n      - count: 10\n        paths:\n          - path: /dev/fuse\n  - name: audio\n    groups:\n      - count: 10\n        paths:\n          - path: /dev/snd\n  - name: capture\n    groups:\n      - paths:\n          - path: /dev/snd/controlC0\n          - path: /dev/snd/pcmC0D0c\n      - paths:\n          - path: /dev/snd/controlC1\n            mountPath: /dev/snd/controlC0\n          - path: /dev/snd/pcmC1D0c\n            mountPath: /dev/snd/pcmC0D0c\n      - paths:\n          - path: /dev/snd/controlC2\n            mountPath: /dev/snd/controlC0\n          - path: /dev/snd/pcmC2D0c\n            mountPath: /dev/snd/pcmC0D0c\n      - paths:\n          - path: /dev/snd/controlC3\n            mountPath: /dev/snd/controlC0\n          - path: /dev/snd/pcmC3D0c\n            mountPath: /dev/snd/pcmC0D0c\n","enabled":true}` | Config map |
 | config.data | string | See [values.yaml](./values.yaml) | generic-device-plugin config file [[ref]](https://github.com/squat/generic-device-plugin#usage) |
 | deviceDomain | string | `"devic.es"` | Domain used by devices for identifcation |
-| image | object | `{"pullPolicy":"Always","repository":"ghcr.io/squat/generic-device-plugin","tag":"latest@sha256:45787848aac84d6b8b592904614339fa82d7c0e422f3287d7f9913896ff3a3f7"}` | Default image |
+| image | object | `{"pullPolicy":"Always","repository":"ghcr.io/squat/generic-device-plugin","tag":"latest@sha256:359bcdd5c7b45a815a50e2f69c5942d85de6db03ff4a3923462af06161bead08"}` | Default image |
 | name | string | `"generic-device-plugin"` | Name override of release |
 | resources | object | `{"requests":{"cpu":"50m","memory":"10Mi"}}` | Default resources |
 | service | object | `{"listenPort":8080}` | Service port |

charts/postgres-cluster/Chart.yaml

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

charts/postgres-cluster/README.md

@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![Version: 6.5.0](https://img.shields.io/badge/Version-6.5.0-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
+![Version: 6.8.0](https://img.shields.io/badge/Version-6.8.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/_helpers.tpl

@@ -88,12 +88,8 @@ Generate recovery server name
 Generate name for recovery object store credentials
 */}}
 {{- define "cluster.recoveryCredentials" -}}
-  {{- if .Values.recovery.endpointCredentials -}}
-    {{- .Values.recovery.endpointCredentials -}}
-  {{- else -}}
   {{- printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-" -}}
 {{- end }}
-{{- end }}
 
 {{/*
 Generate name for backup object store credentials

charts/postgres-cluster/templates/cluster.yaml

@@ -19,7 +19,7 @@ spec:
   {{- end }}
   postgresUID: {{ include "cluster.postgresUID" . }}
   postgresGID: {{ include "cluster.postgresGID" . }}
-  {{ if or (eq .Values.backup.method "objectStore") (eq .Values.recovery.method "objectStore") }}
+  {{ if (eq .Values.backup.method "objectStore") }}
     plugins:
   {{ end }}
   {{- range $objectStore := .Values.backup.objectStore }}
@@ -35,9 +35,10 @@ spec:
         {{- end }}
   {{- end }}
   {{ if eq .Values.recovery.method "objectStore" }}
-    - name: barman-cloud.cloudnative-pg.io
+  externalClusters:
-      enabled: true
+    - name: recovery
-      isWALArchiver: false
+      plugin:
+        name: barman-cloud.cloudnative-pg.io
         parameters:
           barmanObjectName: "{{ include "cluster.name" . }}-{{ .Values.recovery.objectStore.name }}"
           serverName: {{ include "cluster.recoveryServerName" . }}

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,18 +37,10 @@ spec:
     {{- end }}
     s3Credentials:
       accessKeyId:
-        {{- if .endpointCredentials }}
         name: {{ .endpointCredentials }}
-        {{- else }}
-        name: {{ include "cluster.backupCredentials" $context }}
-        {{- end }}
         key: ACCESS_KEY_ID
       secretAccessKey:
-        {{- if .endpointCredentials }}
         name: {{ .endpointCredentials }}
-        {{- else }}
-        name: {{ include "cluster.backupCredentials" $context }}
-        {{- end }}
         key: ACCESS_SECRET_KEY
 {{ end -}}
 {{ end }}
@@ -85,9 +77,9 @@ spec:
       jobs: {{ .Values.recovery.objectStore.data.jobs }}
     s3Credentials:
       accessKeyId:
-        name: {{ include "cluster.recoveryCredentials" . }}
+        name: {{ .Values.recovery.objectStore.endpointCredentials }}
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: {{ 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