From d73b1536405f6398461b5ed909105679bcb6b3c7 Mon Sep 17 00:00:00 2001 From: Wykiki Date: Wed, 16 Mar 2022 09:30:29 +0100 Subject: [PATCH 1/4] Improve restoration process requirements --- .../v2.6/en/backups/migrating-rancher/_index.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.6/en/backups/migrating-rancher/_index.md b/content/rancher/v2.6/en/backups/migrating-rancher/_index.md index 651c300d66b..4519a25bf96 100644 --- a/content/rancher/v2.6/en/backups/migrating-rancher/_index.md +++ b/content/rancher/v2.6/en/backups/migrating-rancher/_index.md @@ -90,11 +90,23 @@ spec: --from-file=./encryption-provider-config.yaml \ -n cattle-resources-system ``` - -1. Then apply the resource: + +Apply the manifest, and watch for the Restore resources status : + +1. Apply the resource: ``` kubectl apply -f migrationResource.yaml ``` +1. Watch the Restore status: + ``` + kubectl get restore + ``` +1. Watch the restoration logs: + ``` + kubectl logs -n cattle-resources-system --tail 100 -f rancher-backup-xxx-xxx + ``` + +Once the Restore resource has the status `Completed`, you can continue the Rancher installation. ### 3. Install cert-manager From 16f797dafa1100ebad43878b8fc4373befdb7634 Mon Sep 17 00:00:00 2001 From: Wykiki Date: Thu, 17 Mar 2022 10:29:21 +0100 Subject: [PATCH 2/4] Separate common restoration steps from encryption Co-authored-by: Jiaqi Luo <6218999+jiaqiluo@users.noreply.github.com> --- content/rancher/v2.6/en/backups/migrating-rancher/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.6/en/backups/migrating-rancher/_index.md b/content/rancher/v2.6/en/backups/migrating-rancher/_index.md index 4519a25bf96..267cf5e6e9e 100644 --- a/content/rancher/v2.6/en/backups/migrating-rancher/_index.md +++ b/content/rancher/v2.6/en/backups/migrating-rancher/_index.md @@ -97,11 +97,11 @@ Apply the manifest, and watch for the Restore resources status : ``` kubectl apply -f migrationResource.yaml ``` -1. Watch the Restore status: +Watch the Restore status: ``` kubectl get restore ``` -1. Watch the restoration logs: +Watch the restoration logs: ``` kubectl logs -n cattle-resources-system --tail 100 -f rancher-backup-xxx-xxx ``` From 6aaa6d16a8271e15a23710c2c0da6ea7432da8f7 Mon Sep 17 00:00:00 2001 From: Wykiki Date: Thu, 17 Mar 2022 10:30:49 +0100 Subject: [PATCH 3/4] Set apply in common operation section --- content/rancher/v2.6/en/backups/migrating-rancher/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/backups/migrating-rancher/_index.md b/content/rancher/v2.6/en/backups/migrating-rancher/_index.md index 267cf5e6e9e..290f1658dde 100644 --- a/content/rancher/v2.6/en/backups/migrating-rancher/_index.md +++ b/content/rancher/v2.6/en/backups/migrating-rancher/_index.md @@ -93,7 +93,7 @@ spec: Apply the manifest, and watch for the Restore resources status : -1. Apply the resource: +Apply the resource: ``` kubectl apply -f migrationResource.yaml ``` From e55c668fb97a76282c9dad2ee5d8090ecd828005 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Thu, 17 Mar 2022 11:03:50 -0700 Subject: [PATCH 4/4] Fix markdown formatting --- .../en/backups/migrating-rancher/_index.md | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/content/rancher/v2.6/en/backups/migrating-rancher/_index.md b/content/rancher/v2.6/en/backups/migrating-rancher/_index.md index 290f1658dde..5b5e4f3acdd 100644 --- a/content/rancher/v2.6/en/backups/migrating-rancher/_index.md +++ b/content/rancher/v2.6/en/backups/migrating-rancher/_index.md @@ -85,26 +85,28 @@ spec: >**Important:** The field `encryptionConfigSecretName` must be set only if your backup was created with encryption enabled. Provide the name of the Secret containing the encryption config file. If you only have the encryption config file, but don't have a secret created with it in this cluster, use the following steps to create the secret: 1. The encryption configuration file must be named `encryption-provider-config.yaml`, and the `--from-file` flag must be used to create this secret. So save your `EncryptionConfiguration` in a file called `encryption-provider-config.yaml` and run this command: - ``` - kubectl create secret generic encryptionconfig \ - --from-file=./encryption-provider-config.yaml \ - -n cattle-resources-system - ``` +``` +kubectl create secret generic encryptionconfig \ + --from-file=./encryption-provider-config.yaml \ + -n cattle-resources-system +``` -Apply the manifest, and watch for the Restore resources status : +1. Apply the manifest, and watch for the Restore resources status: -Apply the resource: - ``` - kubectl apply -f migrationResource.yaml - ``` -Watch the Restore status: - ``` - kubectl get restore - ``` -Watch the restoration logs: - ``` - kubectl logs -n cattle-resources-system --tail 100 -f rancher-backup-xxx-xxx - ``` + Apply the resource: +``` +kubectl apply -f migrationResource.yaml +``` + + Watch the Restore status: +``` +kubectl get restore +``` + + Watch the restoration logs: +``` +kubectl logs -n cattle-resources-system --tail 100 -f rancher-backup-xxx-xxx +``` Once the Restore resource has the status `Completed`, you can continue the Rancher installation.