feat(recovery): use plugin to recover cluster when plugin is enabled

Signed-off-by: Philipp Hamann <[email protected]>

Author: pha91

charts/cluster/templates/_bootstrap.tpl

@@ -86,25 +86,35 @@ externalClusters:
     recoveryTarget:
       targetTime: {{ . }}
     {{- end }}
-    {{ with .Values.recovery.database }}
+    {{- with .Values.recovery.database }}
     database: {{ . }}
     {{- end }}
-    {{ with .Values.recovery.owner }}
+    {{- with .Values.recovery.owner }}
     owner: {{ . }}
     {{- end }}
     {{- if eq .Values.recovery.method "backup" }}
     backup:
       name: {{ .Values.recovery.backupName }}
-    {{- else if eq .Values.recovery.method "object_store" }}
+    {{- else if and (eq .Values.recovery.method "object_store") (eq (include "cluster.useBarmanCloudPlugin" .) "false") }}
     source: objectStoreRecoveryCluster
 
 externalClusters:
   - name: objectStoreRecoveryCluster
     barmanObjectStore:
       serverName: {{ .Values.recovery.clusterName }}
       {{- $d := dict "chartFullname" (include "cluster.fullname" .) "scope" .Values.recovery "secretPrefix" "recovery" -}}
-      {{- include "cluster.barmanObjectStoreConfig" $d | nindent 4 }}
-    {{- end }}
+      {{- include "cluster.barmanObjectStoreConfig" $d | indent 4 }}
+    {{- else if and (eq .Values.recovery.method "object_store") (eq (include "cluster.useBarmanCloudPlugin" .) "true") }}
+    source: origin
+
+externalClusters:
+    - name: origin
+      plugin:
+        name: barman-cloud.cloudnative-pg.io
+        parameters:
+          barmanObjectName: {{ include "cluster.fullname" $  }}-object-store
+          serverName: {{ .Values.recovery.clusterName |  default (include "cluster.fullname" .) }}
+{{- end }}
 {{- end }}
 {{-  else }}
   {{ fail "Invalid cluster mode!" }}

charts/cluster/templates/objectStore.yaml

@@ -1,10 +1,14 @@
-{{ if and (eq (include "cluster.useBarmanCloudPlugin" .) "true") .Values.backups.enabled }}
+{{ if eq (include "cluster.useBarmanCloudPlugin" .) "true" }}
 apiVersion: barmancloud.cnpg.io/v1
 kind: ObjectStore
 metadata:
   name: {{ include "cluster.fullname" $  }}-object-store
 spec:
   configuration:
+  {{- if and (eq .Values.mode "recovery") (eq .Values.recovery.method "object_store") -}}
+  {{- $d := dict "chartFullname" (include "cluster.fullname" .) "scope" .Values.recovery "secretPrefix" "recovery" -}}
+  {{- include "cluster.barmanObjectStoreConfig" $d | indent 2 }}
+  {{- else }}
     wal:
       compression: {{ .Values.backups.wal.compression }}
       {{- if .Values.backups.wal.encryption }}
@@ -17,6 +21,7 @@ spec:
       encryption: {{ .Values.backups.data.encryption }}
       {{- end }}
       jobs: {{ .Values.backups.data.jobs }}
-    {{- $d := dict "chartFullname" (include "cluster.fullname" .) "scope" .Values.backups "secretPrefix" "backup" -}}
-    {{- include "cluster.barmanObjectStoreConfig" $d | indent 2 }}
+  {{- $d := dict "chartFullname" (include "cluster.fullname" .) "scope" .Values.backups "secretPrefix" "backup" -}}
+  {{- include "cluster.barmanObjectStoreConfig" $d | indent 2 }}
+  {{- end }}
 {{- end }}