From 4ec754cb6bbb868631f380ad408e47fe46f8d292 Mon Sep 17 00:00:00 2001 From: Daniel Hauswirth Date: Fri, 6 Jan 2023 11:38:29 +0100 Subject: [PATCH 1/3] Add vault to prerequisites --- docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc b/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc index 8b09f3d6..681dcb69 100644 --- a/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc +++ b/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc @@ -7,6 +7,7 @@ ** `jq` ** `yq` https://mikefarah.gitbook.io/yq[yq] (version 4 or higher) ** `restic` +** `vault` * API access to the target cluster == General procedure From 981869a3fe50a33c7fcd4c0618b988cec66be785 Mon Sep 17 00:00:00 2001 From: Daniel Hauswirth Date: Fri, 6 Jan 2023 12:04:52 +0100 Subject: [PATCH 2/3] Extend explanation about REPO_URL --- docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc b/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc index 681dcb69..10b0f1c1 100644 --- a/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc +++ b/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc @@ -38,6 +38,8 @@ export AWS_SECRET_ACCESS_KEY=$(kubectl --as cluster-admin -n syn-cluster-backup 1. Obtain the repository URL of the clusters catalog and export it to `REPO_URL` + Get the URL from https://control.vshn.net/syn/lieutenantclusters. +Ensure to use the `ssh://` URL not https one. ++ Alternatively, get it from the Lieutenant API or the Kubernetes API Lieutenant is running on. + .Use the Lieutenant API From 0190d1e2a6cab87f9e21856753b138c475fb457b Mon Sep 17 00:00:00 2001 From: Daniel Hauswirth Date: Fri, 6 Jan 2023 15:15:58 +0100 Subject: [PATCH 3/3] Fix vault command --- docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc b/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc index 10b0f1c1..fc659c35 100644 --- a/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc +++ b/docs/modules/ROOT/pages/how-tos/recover-from-backup.adoc @@ -66,6 +66,7 @@ git archive --remote ${REPO_URL} master | tar -xC catalog + [source,console] ---- +export VAULT_ADDR=https://vault-prod.syn.vshn.net vault login -method=oidc ----