From da2cb9b8f83f492424650d27ee3b572ce2c67686 Mon Sep 17 00:00:00 2001
From: nobleess <tikhonovnikita063@gmail.com>
Date: Wed, 28 May 2025 12:34:32 +0300
Subject: [PATCH 1/2] add ref secret for update password

---
 charts/cluster/examples/recovery-object_store.yaml | 5 +++++
 charts/cluster/templates/_bootstrap.tpl            | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/charts/cluster/examples/recovery-object_store.yaml b/charts/cluster/examples/recovery-object_store.yaml
index 060f5328de..ac418d4557 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: example
+  owner: example
+  secret:
+    name: example
   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
diff --git a/charts/cluster/templates/_bootstrap.tpl b/charts/cluster/templates/_bootstrap.tpl
index 95bedd214f..71f70ae28f 100644
--- a/charts/cluster/templates/_bootstrap.tpl
+++ b/charts/cluster/templates/_bootstrap.tpl
@@ -92,6 +92,9 @@ externalClusters:
     {{ with .Values.recovery.owner }}
     owner: {{ . }}
     {{- end }}
+    {{ with .Values.recovery.secret }}
+    secret: {{ . }}
+    {{- end }}
     {{- if eq .Values.recovery.method "backup" }}
     backup:
       name: {{ .Values.recovery.backupName }}

From 1ed9fae26df942547cac5159dcaecffada9185ff Mon Sep 17 00:00:00 2001
From: nobleess <tikhonovnikita063@gmail.com>
Date: Wed, 28 May 2025 13:00:37 +0300
Subject: [PATCH 2/2] fix

---
 charts/cluster/examples/recovery-object_store.yaml | 10 +++++++---
 charts/cluster/templates/_bootstrap.tpl            |  5 +++--
 charts/cluster/templates/recovery-s3-creds.yaml    |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/charts/cluster/examples/recovery-object_store.yaml b/charts/cluster/examples/recovery-object_store.yaml
index ac418d4557..e79d67867b 100644
--- a/charts/cluster/examples/recovery-object_store.yaml
+++ b/charts/cluster/examples/recovery-object_store.yaml
@@ -4,10 +4,10 @@ mode: recovery
 recovery:
   method: object_store
   clusterName: "cluster-name-to-recover-from"
-  database: example
-  owner: example
+  database: app
+  owner: app
   secret:
-    name: example
+    name: app
   provider: s3
   s3:
     region: "eu-west-1"
@@ -34,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 71f70ae28f..54ef73e51a 100644
--- a/charts/cluster/templates/_bootstrap.tpl
+++ b/charts/cluster/templates/_bootstrap.tpl
@@ -92,8 +92,9 @@ externalClusters:
     {{ with .Values.recovery.owner }}
     owner: {{ . }}
     {{- end }}
-    {{ with .Values.recovery.secret }}
-    secret: {{ . }}
+    {{ with .Values.recovery.secret.name }}
+    secret:
+      name: {{ . }}
     {{- end }}
     {{- if eq .Values.recovery.method "backup" }}
     backup:
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 }}