diff --git a/cnpg-liquid/templates/cnpg-cluster.yaml b/cnpg-liquid/templates/cnpg-cluster.yaml index 611bd99..ff6e2bb 100644 --- a/cnpg-liquid/templates/cnpg-cluster.yaml +++ b/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 }} \ No newline at end of file diff --git a/cnpg-liquid/templates/scheduled-backup.yaml b/cnpg-liquid/templates/scheduled-backup.yaml new file mode 100644 index 0000000..acc5d87 --- /dev/null +++ b/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 }} \ No newline at end of file diff --git a/cnpg-liquid/values.yaml b/cnpg-liquid/values.yaml index 02935fb..cf8a4a4 100644 --- a/cnpg-liquid/values.yaml +++ b/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 diff --git a/liquid-code-chart/templates/pre-install-migration.yaml b/liquid-code-chart/templates/pre-install-migration.yaml index 0cbc4ee..67514c3 100644 --- a/liquid-code-chart/templates/pre-install-migration.yaml +++ b/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: