Fix backup/restore

cnpg-liquid/templates/cnpg-cluster.yaml

@@ -2,9 +2,6 @@ apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
   name: {{ required "Cluster name required" .Values.cnpg.clusterName }}
-  annotations:
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-weight": "-1"
 spec:
   startDelay: 300
   stopDelay: 300
@@ -18,7 +15,7 @@ spec:
   externalClusters:
     - name: {{ required "Old cluster name required" .Values.cnpg.recovery.oldClusterName }}
       barmanObjectStore:
-        destinationPath: {{ .Values.cnpg.recovery.oldClusterName }}
+        destinationPath: {{ .Values.cnpg.recovery.sourcePath }}
         endpointURL: {{ .Values.s3.endpointUrl | quote }}
         s3Credentials:
           accessKeyId:
@@ -57,4 +54,4 @@ spec:
       data:
         compression: bzip2
     retentionPolicy: "7d"
-  {{ end }}
+  {{ end }}

cnpg-liquid/templates/scheduled-backup.yaml

@@ -0,0 +1,11 @@
+{{ if .Values.cnpg.backup.enable }}
+apiVersion: postgresql.cnpg.io/v1
+kind: ScheduledBackup
+metadata:
+  name: {{ required "Cluster name required" .Values.cnpg.clusterName }}-scheduled-backup
+spec:
+  method: barmanObjectStore
+  schedule: {{ .Values.cnpg.backup.schedule | quote }}
+  cluster:
+    name: {{ required "Cluster name required" .Values.cnpg.clusterName }}
+{{ end }}

cnpg-liquid/values.yaml

@@ -7,6 +7,7 @@ cnpg:
   clusterName: liquid-db
   backup:
     enable: true
+    schedule: "0 0 0 * * *"
     destinationPath: "s3://liquid-code/backup"
   recovery:
     enable: false

liquid-code-chart/templates/pre-install-migration.yaml

@@ -9,6 +9,7 @@ metadata:
     helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
   annotations:
     "helm.sh/hook": pre-install
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
   template:
     metadata: