add credential defaults

charts/postgres-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 6.7.0
+version: 6.9.0
 description: Cloudnative-pg Cluster
 keywords:
   - database
@@ -11,4 +11,4 @@ sources:
 maintainers:
   - name: alexlebens
 icon: https://avatars.githubusercontent.com/u/100373852?s=48&v=4
-appVersion: v1.26.0
+appVersion: v1.27.0

charts/postgres-cluster/README.md

@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![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)
+![Version: 6.9.0](https://img.shields.io/badge/Version-6.9.0-informational?style=flat-square) ![AppVersion: v1.27.0](https://img.shields.io/badge/AppVersion-v1.27.0-informational?style=flat-square)
 
 Cloudnative-pg Cluster
 

charts/postgres-cluster/templates/_helpers.tpl

@@ -83,17 +83,3 @@ Generate recovery server name
     {{- printf "%s-backup-%s" (include "cluster.name" .) (toString .Values.recovery.objectStore.index) | trunc 63 | trimSuffix "-" -}}
   {{- end }}
 {{- end }}
-
-{{/*
-Generate name for recovery object store credentials
-*/}}
-{{- define "cluster.recoveryCredentials" -}}
-  {{- printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-" -}}
-{{- end }}
-
-{{/*
-Generate name for backup object store credentials
-*/}}
-{{- define "cluster.backupCredentials" -}}
-  {{- printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-" -}}
-{{- end }}

charts/postgres-cluster/templates/cluster.yaml

@@ -19,10 +19,8 @@ spec:
   {{- end }}
   postgresUID: {{ include "cluster.postgresUID" . }}
   postgresGID: {{ include "cluster.postgresGID" . }}
-  {{ if or (eq .Values.backup.method "objectStore") (eq .Values.recovery.method "objectStore") }}
-  plugins:
-  {{ end }}
   {{- range $objectStore := .Values.backup.objectStore }}
+  plugins:
     - name: barman-cloud.cloudnative-pg.io
       enabled: true
       isWALArchiver: {{ $objectStore.isWALArchiver | default true }}
@@ -34,13 +32,14 @@ spec:
         serverName: "{{ include "cluster.name" $ }}-backup-{{ $objectStore.index }}"
         {{- end }}
   {{- end }}
-  {{ if eq .Values.recovery.method "objectStore" }}
+  {{ if (eq .Values.recovery.method "objectStore") }}
-    - name: barman-cloud.cloudnative-pg.io
+  externalClusters:
-      enabled: true
+    - name: recovery
-      isWALArchiver: false
+      plugin:
-      parameters:
+        name: barman-cloud.cloudnative-pg.io
-        barmanObjectName: "{{ include "cluster.name" . }}-{{ .Values.recovery.objectStore.name }}"
+        parameters:
-        serverName: {{ include "cluster.recoveryServerName" . }}
+          barmanObjectName: "{{ include "cluster.name" . }}-{{ .Values.recovery.objectStore.name }}"
+          serverName: {{ include "cluster.recoveryServerName" . }}
   {{ end }}
   storage:
     size: {{ .Values.cluster.storage.size }}

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

@@ -37,10 +37,10 @@ spec:
     {{- end }}
     s3Credentials:
       accessKeyId:
-        name: {{ .endpointCredentials }}
+        name: {{ .endpointCredentials | default (printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-") }}
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: {{ .endpointCredentials }}
+        name: {{ .endpointCredentials | default (printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-") }}
         key: ACCESS_SECRET_KEY
 {{ end -}}
 {{ end }}
@@ -77,9 +77,9 @@ spec:
       jobs: {{ .Values.recovery.objectStore.data.jobs }}
     s3Credentials:
       accessKeyId:
-        name: {{ .Values.recovery.objectStore.endpointCredentials }}
+        name: {{ .Values.recovery.objectStore.endpointCredentials | default (printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-") }}
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: {{ .Values.recovery.objectStore.endpointCredentials }}
+        name: {{ .Values.recovery.objectStore.endpointCredentials | default (printf "%s-cluster-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-") }}
         key: ACCESS_SECRET_KEY
 {{ end }}

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

@@ -9,7 +9,7 @@ metadata:
   labels:
     {{- include "cluster.labels" $context | nindent 4 }}
 spec:
-  immediate: {{ .immediate | default true }}
+  immediate: {{ .immediate | default false }}
   suspend: {{ .suspend | default false }}
   schedule: {{ .schedule | quote | required "Schedule is required" }}
   backupOwnerReference: {{ .backupOwnerReference | default "self" }}