diff --git a/charts/cluster/examples/recovery-object_store.yaml b/charts/cluster/examples/recovery-object_store.yaml index 060f5328de..e79d67867b 100644 --- a/charts/cluster/examples/recovery-object_store.yaml +++ b/charts/cluster/examples/recovery-object_store.yaml @@ -4,6 +4,10 @@ mode: recovery recovery: method: object_store clusterName: "cluster-name-to-recover-from" + database: app + owner: app + secret: + name: app provider: s3 s3: region: "eu-west-1" @@ -11,6 +15,7 @@ recovery: path: "/v1-restore" accessKey: "AWS_S3_ACCESS_KEY" secretKey: "AWS_S3_SECRET_KEY" + cluster: instances: 1 @@ -29,3 +34,7 @@ backups: schedule: "0 0 0 * * *" # Daily at midnight backupOwnerReference: self retentionPolicy: "30d" + secret: + create: false + name: "s3" + diff --git a/charts/cluster/templates/_bootstrap.tpl b/charts/cluster/templates/_bootstrap.tpl index 95bedd214f..54ef73e51a 100644 --- a/charts/cluster/templates/_bootstrap.tpl +++ b/charts/cluster/templates/_bootstrap.tpl @@ -92,6 +92,10 @@ externalClusters: {{ with .Values.recovery.owner }} owner: {{ . }} {{- end }} + {{ with .Values.recovery.secret.name }} + secret: + name: {{ . }} + {{- end }} {{- if eq .Values.recovery.method "backup" }} backup: name: {{ .Values.recovery.backupName }} diff --git a/charts/cluster/templates/recovery-s3-creds.yaml b/charts/cluster/templates/recovery-s3-creds.yaml index d70ed2120f..281029d70d 100644 --- a/charts/cluster/templates/recovery-s3-creds.yaml +++ b/charts/cluster/templates/recovery-s3-creds.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: {{ default (printf "%s-recovery-s3-creds" (include "cluster.fullname" .)) .Values.recovery.secret.name }} + name: {{ default (printf "%s-recovery-s3-creds" (include "cluster.fullname" .)) .Values.backups.secret.name}} namespace: {{ include "cluster.namespace" . }} data: ACCESS_KEY_ID: {{ required ".Values.recovery.s3.accessKey is required, but not specified." .Values.recovery.s3.accessKey | b64enc | quote }}