From ac865ea2961f3525fe7e2a5231f90d057fb6dc28 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Tue, 2 Nov 2021 15:43:10 -0400 Subject: [PATCH 1/4] Corrected pod name; minor edit for consistency --- .../install-rancher-on-k8s/rollbacks/_index.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md index 8f7a32d5b0b..86422e4c666 100644 --- a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md +++ b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md @@ -32,7 +32,7 @@ A restore is performed by creating a Restore custom resource. 1. From the **Global** view, hover over the **local** cluster. 1. Under **Projects in local**, click on **System**. -1. From the **cattle-system** namespace section, find the `rancher-hook` deployment. +1. From the **cattle-system** namespace section, find the `rancher` deployment. 1. Select **⋮ > Edit**. 1. Change **Scalable deployment of _ pods** to `0`. 1. Scroll to the bottom and click **Save**. @@ -41,8 +41,8 @@ A restore is performed by creating a Restore custom resource. 1. In the **Cluster Explorer,** go to the dropdown menu in the upper left corner and click **Rancher Backups.** 1. Click **Restore.** -1. Create the Restore with the form, or with YAML. For creating the Restore resource using form, refer to the [configuration reference]({{}}/rancher/v2.5/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.5/en/backups/examples) -1. For using the YAML editor, we can click **Create > Create from YAML.** Enter the Restore YAML. +1. Create the Restore with the form, or with YAML. For creating the Restore resource using form, refer to the [configuration reference]({{}}/rancher/v2.5/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.5/en/backups/examples) +1. For using the YAML editor, we can click **Create > Create from YAML.** Enter the Restore YAML. The following is an example Restore custom resource: ```yaml apiVersion: resources.cattle.io/v1 @@ -62,8 +62,6 @@ A restore is performed by creating a Restore custom resource. endpoint: s3.us-west-2.amazonaws.com ``` - For help configuring the Restore, refer to the [configuration reference]({{}}/rancher/v2.5/en/backups/v2.5/configuration/restore-config/) and to the [examples.]({{}}/rancher/v2.5/en/backups/v2.5/examples/) - 1. Click **Create.** **Result:** The backup file is created and updated to the target storage location. The resources are restored in this order: From a3cce2572f63746f9076a75cd956c6ab46461f9a Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Tue, 2 Nov 2021 16:58:07 -0400 Subject: [PATCH 2/4] Edited pages for consistency as requested in 2.5 and 2.6 --- .../install-rancher-on-k8s/rollbacks/_index.md | 5 +++-- .../install-rancher-on-k8s/rollbacks/_index.md | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md index 86422e4c666..50df11ecd3e 100644 --- a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md +++ b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md @@ -41,8 +41,8 @@ A restore is performed by creating a Restore custom resource. 1. In the **Cluster Explorer,** go to the dropdown menu in the upper left corner and click **Rancher Backups.** 1. Click **Restore.** -1. Create the Restore with the form, or with YAML. For creating the Restore resource using form, refer to the [configuration reference]({{}}/rancher/v2.5/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.5/en/backups/examples) -1. For using the YAML editor, we can click **Create > Create from YAML.** Enter the Restore YAML. The following is an example Restore custom resource: +1. Create the Restore with the form or with YAML. For help creating the Restore resource using the online form, refer to the [configuration reference]({{}}/rancher/v2.5/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.5/en/backups/examples) +1. To use the YAML editor, you can click **Create > Create from YAML.** Enter the Restore YAML. The following is an example Restore custom resource: ```yaml apiVersion: resources.cattle.io/v1 @@ -61,6 +61,7 @@ A restore is performed by creating a Restore custom resource. region: us-west-2 endpoint: s3.us-west-2.amazonaws.com ``` + For help configuring the Restore, refer to the [configuration reference]({{}}/rancher/v2.5/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.5/en/backups/examples) 1. Click **Create.** diff --git a/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md b/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md index 652e9057515..41a3755feae 100644 --- a/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md +++ b/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md @@ -9,7 +9,7 @@ weight: 3 # Rolling Back to Rancher v2.5.0+ -To roll back to Rancher v2.5.0+, use the **Rancher Backups** application and restore Rancher from backup. +To roll back to Rancher v2.5.0+, use the `rancher backup` application and restore Rancher from backup. Rancher has to be started with the lower/previous version after a rollback. @@ -36,7 +36,8 @@ A restore is performed by creating a Restore custom resource. 1. Go to the cluster that you created and click **Explore**. 1. In the left navigation bar, click **Rancher Backups > Restore**. 1. Click **Create**. -1. Create the Restore with the form, or with YAML. For creating the Restore resource using form, refer to the [configuration reference]({{}}/rancher/v2.6/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.6/en/backups/examples) The following is an example Restore custom resource: +1. Create the Restore with the form or with YAML. For help creating the Restore resource using the online form, refer to the [configuration reference]({{}}/rancher/v2.6/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.6/en/backups/examples) +1. To use the YAML editor, you can click **Create > Create from YAML.** Enter the Restore YAML. The following is an example Restore custom resource: ```yaml apiVersion: resources.cattle.io/v1 @@ -55,8 +56,7 @@ A restore is performed by creating a Restore custom resource. region: us-west-2 endpoint: s3.us-west-2.amazonaws.com ``` - - For help configuring the Restore, refer to the [configuration reference]({{}}/rancher/v2.6/en/backups/configuration/restore-config/) and to the [examples.]({{}}/rancher/v2.6/en/backups/examples/) + For help configuring the Restore, refer to the [configuration reference]({{}}/rancher/v2.6/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.6/en/backups/examples) 1. Click **Create**. From 4a1f7071c35117420d19aa897096452b0a4b89a6 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Wed, 3 Nov 2021 18:08:33 -0400 Subject: [PATCH 3/4] Updated per feedback, verified in local cluster --- .../install-rancher-on-k8s/rollbacks/_index.md | 3 ++- .../install-rancher-on-k8s/rollbacks/_index.md | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md index 50df11ecd3e..65b0c2945c3 100644 --- a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md +++ b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md @@ -17,7 +17,7 @@ aliases: # Rolling Back to Rancher v2.5.0+ -To roll back to Rancher v2.5.0+, use the `rancher-backup` application and restore Rancher from backup. +To roll back to Rancher v2.5.0+, use the **Rancher-Backups** application and restore Rancher from backup. Rancher has to be started with the lower/previous version after a rollback. @@ -40,6 +40,7 @@ A restore is performed by creating a Restore custom resource. ### Create the Restore Custom Resource 1. In the **Cluster Explorer,** go to the dropdown menu in the upper left corner and click **Rancher Backups.** + * **Note:** If the Rancher Backups app is not visible in the dropdown, you will need to install it from the Charts page in **Apps & Marketplace**. Refer [here]({{}}/rancher/v2.5/en/helm-charts/#charts) for more information. 1. Click **Restore.** 1. Create the Restore with the form or with YAML. For help creating the Restore resource using the online form, refer to the [configuration reference]({{}}/rancher/v2.5/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.5/en/backups/examples) 1. To use the YAML editor, you can click **Create > Create from YAML.** Enter the Restore YAML. The following is an example Restore custom resource: diff --git a/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md b/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md index 41a3755feae..dd7c540fc00 100644 --- a/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md +++ b/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md @@ -9,7 +9,7 @@ weight: 3 # Rolling Back to Rancher v2.5.0+ -To roll back to Rancher v2.5.0+, use the `rancher backup` application and restore Rancher from backup. +To roll back to Rancher v2.5.0+, use the **Rancher-Backups** application and restore Rancher from backup. Rancher has to be started with the lower/previous version after a rollback. @@ -32,9 +32,10 @@ A restore is performed by creating a Restore custom resource. ### Create the Restore Custom Resource -1. Click **☰ > Cluster Management**. -1. Go to the cluster that you created and click **Explore**. +1. Click **☰ > Cluster Management**. +1. Go to the local cluster and click **Explore**. 1. In the left navigation bar, click **Rancher Backups > Restore**. + * **Note:** If the Rancher Backups app is not visible, you will need to install it from the Charts page in **Apps & Marketplace**. Refer [here]({{}}/rancher/v2.6/en/helm-charts/#charts) for more information. 1. Click **Create**. 1. Create the Restore with the form or with YAML. For help creating the Restore resource using the online form, refer to the [configuration reference]({{}}/rancher/v2.6/en/backups/configuration/restore-config) and to the [examples.]({{}}/rancher/v2.6/en/backups/examples) 1. To use the YAML editor, you can click **Create > Create from YAML.** Enter the Restore YAML. The following is an example Restore custom resource: From 42c6501249ff5c017d27be3acb9ba0a357649d86 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Wed, 3 Nov 2021 18:11:23 -0400 Subject: [PATCH 4/4] Removed unneeded hyphen --- .../en/installation/install-rancher-on-k8s/rollbacks/_index.md | 2 +- .../en/installation/install-rancher-on-k8s/rollbacks/_index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md index 65b0c2945c3..af3ce821626 100644 --- a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md +++ b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/rollbacks/_index.md @@ -17,7 +17,7 @@ aliases: # Rolling Back to Rancher v2.5.0+ -To roll back to Rancher v2.5.0+, use the **Rancher-Backups** application and restore Rancher from backup. +To roll back to Rancher v2.5.0+, use the **Rancher Backups** application and restore Rancher from backup. Rancher has to be started with the lower/previous version after a rollback. diff --git a/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md b/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md index dd7c540fc00..d3c65fc28d0 100644 --- a/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md +++ b/content/rancher/v2.6/en/installation/install-rancher-on-k8s/rollbacks/_index.md @@ -9,7 +9,7 @@ weight: 3 # Rolling Back to Rancher v2.5.0+ -To roll back to Rancher v2.5.0+, use the **Rancher-Backups** application and restore Rancher from backup. +To roll back to Rancher v2.5.0+, use the **Rancher Backups** application and restore Rancher from backup. Rancher has to be started with the lower/previous version after a rollback.