organize

charts/postgres-cluster/Chart.yaml

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

charts/postgres-cluster/README.md

@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![Version: 6.17.2](https://img.shields.io/badge/Version-6.17.2-informational?style=flat-square) ![AppVersion: v1.28.0](https://img.shields.io/badge/AppVersion-v1.28.0-informational?style=flat-square)
+![Version: 6.17.3](https://img.shields.io/badge/Version-6.17.3-informational?style=flat-square) ![AppVersion: v1.28.0](https://img.shields.io/badge/AppVersion-v1.28.0-informational?style=flat-square)
 
 Cloudnative-pg Cluster
 

charts/postgres-cluster/templates/cluster.yaml

@@ -19,32 +19,6 @@ spec:
   {{- end }}
   postgresUID: {{ include "cluster.postgresUID" . }}
   postgresGID: {{ include "cluster.postgresGID" . }}
-  plugins:
-  {{- range $objectStore := .Values.backup.objectStore }}
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      {{- if $objectStore.isWALArchiver }}
-      isWALArchiver: true
-      {{- else }}
-      isWALArchiver: false
-      {{- end }}
-      parameters:
-        barmanObjectName: "{{ include "cluster.name" $ }}-{{ $objectStore.name }}-backup"
-        {{- if $objectStore.clusterName }}
-        serverName: "{{ $objectStore.clusterName }}-backup-{{ $objectStore.index }}"
-        {{- else }}
-        serverName: "{{ include "cluster.name" $ }}-backup-{{ $objectStore.index }}"
-        {{- end }}
-  {{- end }}
-  {{ if (eq .Values.recovery.method "objectStore") }}
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "{{ include "cluster.name" . }}-{{ .Values.recovery.objectStore.name }}"
-          serverName: {{ include "cluster.recoveryServerName" . }}
-  {{ end }}
   storage:
     size: {{ .Values.cluster.storage.size }}
     {{- if not (empty .Values.cluster.storage.storageClass) }}
@@ -155,4 +129,22 @@ spec:
     {{ end }}
     {{- end }}
 
+  plugins:
+  {{- range $objectStore := .Values.backup.objectStore }}
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      {{- if $objectStore.isWALArchiver }}
+      isWALArchiver: true
+      {{- else }}
+      isWALArchiver: false
+      {{- end }}
+      parameters:
+        barmanObjectName: "{{ include "cluster.name" $ }}-{{ $objectStore.name }}-backup"
+        {{- if $objectStore.clusterName }}
+        serverName: "{{ $objectStore.clusterName }}-backup-{{ $objectStore.index }}"
+        {{- else }}
+        serverName: "{{ include "cluster.name" $ }}-backup-{{ $objectStore.index }}"
+        {{- end }}
+  {{- end }}
+
   {{ include "cluster.bootstrap" . | nindent 2 }}