diff --git a/content/rancher/v2.x/en/upgrades/_index.md b/content/rancher/v2.x/en/upgrades/_index.md index 70f74d85467..a02157a6014 100644 --- a/content/rancher/v2.x/en/upgrades/_index.md +++ b/content/rancher/v2.x/en/upgrades/_index.md @@ -9,9 +9,15 @@ Each new version of Rancher 2.x.x supports upgrades from previous versions of Ra Complete one of the upgrade procedures below based on your Rancher installation: -- [Single Node Upgrade](./single-node-upgrade/) -- [High Availability Upgrade](./ha-server-upgrade/) -- [Air Gap Upgrade](./air-gap-upgrade/) +- [Single Node Upgrade]({{< baseurl >}}/rancher/v2.x/en/upgrades/single-node-upgrade) +- [High Availability Upgrade]({{< baseurl >}}/rancher/v2.x/en/upgrades/ha-server-upgrade) +- [Air Gap Upgrade]({{< baseurl >}}/rancher/v2.x/en/upgrades/air-gap-upgrade) + +### Rolling Back Unsuccessful Upgrades + +In the event that your Rancher Server does not upgrade successfully, you can rollback to your installation prior to upgrade: + +- [Rollbacks]({{< baseurl >}}/rancher/v2.x/en/upgrades/rollbacks) ### Migrating from Rancher 1.6.x diff --git a/content/rancher/v2.x/en/backups/rollbacks/_index.md b/content/rancher/v2.x/en/upgrades/rollbacks/_index.md similarity index 54% rename from content/rancher/v2.x/en/backups/rollbacks/_index.md rename to content/rancher/v2.x/en/upgrades/rollbacks/_index.md index 5c5fae9b3a8..3e99175b3bb 100644 --- a/content/rancher/v2.x/en/backups/rollbacks/_index.md +++ b/content/rancher/v2.x/en/upgrades/rollbacks/_index.md @@ -6,5 +6,5 @@ weight: 1010 If you upgrade your Rancher Server and the upgrade is unsuccessful, you can use the backup you created during the upgrade process to restore the previous version of Rancher, along with its data. -- [Rolling Back—Single Node Installs](./single-node-rollbacks/) -- [Rolling Back—High Availablity Installs](./ha-server-rollbacks/) \ No newline at end of file +- [Rolling Back—Single Node Installs](({{< baseurl >}}/rancher/v2.x/en/rollbacks/single-node-rollbacks) +- [Rolling Back—High Availability Installs]({{< baseurl >}}/rancher/v2.x/en/rollbacks/ha-server-rollbacks) \ No newline at end of file diff --git a/content/rancher/v2.x/en/backups/rollbacks/ha-server-rollbacks/_index.md b/content/rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/_index.md similarity index 85% rename from content/rancher/v2.x/en/backups/rollbacks/ha-server-rollbacks/_index.md rename to content/rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/_index.md index 3801e237f70..05c5ee09bf7 100644 --- a/content/rancher/v2.x/en/backups/rollbacks/ha-server-rollbacks/_index.md +++ b/content/rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/_index.md @@ -2,7 +2,7 @@ title: Rolling Back—High Availability Installs weight: 50 aliases: - - /rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/ + - /rancher/v2.x/en/backups/rollbacks/ha-server-rollbacks --- If you upgrade Rancher, but the upgrade does not complete successfully, you may need to roll back your Rancher Server to its last healthy state before upgrade. To restore Rancher: @@ -57,14 +57,13 @@ kubectl --kubeconfig=kube_config_rancher-cluster.yml set image deployment/cattle ## Troubleshooting -With _v0.1.8_ and below, the **rke-bundle-cert** container is left over from a failed etcd restore. If you are having an issue with restoring an **etcd snapshot** then you can do the following on each etcd nodes before attempting to -do another restore: +With **RKE v0.1.8** and below, the **rke-bundle-cert** container is left over from a failed etcd restore. If you are having an issue with restoring an **etcd snapshot** then you can do the following on each etcd nodes before attempting to do another restore: ``` docker container rm --force rke-bundle-cert ``` -The rke-bundle-cert container is usally removed when a backup or restore of **etcd** succeeds. +The rke-bundle-cert container is usually removed when a backup or restore of **etcd** succeeds. Whenever something goes wrong, the **rke-bundle-cert** container will be left over. You can look at the logs or inspect the container to see what the issue is. @@ -75,5 +74,5 @@ docker container inspect rke-bundle-cert The important thing to note is the mounts of the container and location of the **pki.bundle.tar.gz**. -As of _v0.1.9_, the **rke-bundle-cert** container is removed on both success and +As of **RKE v0.1.9**, the **rke-bundle-cert** container is removed on both success and failure of a restore. To debug any issues, you will need to look at the **logs** generated from rke. diff --git a/content/rancher/v2.x/en/backups/rollbacks/single-node-rollbacks/_index.md b/content/rancher/v2.x/en/upgrades/rollbacks/single-node-rollbacks/_index.md similarity index 95% rename from content/rancher/v2.x/en/backups/rollbacks/single-node-rollbacks/_index.md rename to content/rancher/v2.x/en/upgrades/rollbacks/single-node-rollbacks/_index.md index 698bd9ea667..660f22493d1 100644 --- a/content/rancher/v2.x/en/backups/rollbacks/single-node-rollbacks/_index.md +++ b/content/rancher/v2.x/en/upgrades/rollbacks/single-node-rollbacks/_index.md @@ -1,6 +1,8 @@ --- title: Rolling Back—Single Node Installs weight: 25 +aliases: + - /rancher/v2.x/en/backups/rollbacks/single-node-rollbacks --- Rolling back an unsuccessful Rancher upgrade requires you to diff --git a/content/rke/v0.1.x/en/installation/etcd-snapshots/_index.md b/content/rke/v0.1.x/en/installation/etcd-snapshots/_index.md index 65d363f05f2..022fdee9912 100644 --- a/content/rke/v0.1.x/en/installation/etcd-snapshots/_index.md +++ b/content/rke/v0.1.x/en/installation/etcd-snapshots/_index.md @@ -221,13 +221,13 @@ nginx-65899c769f-qkhml 1/1 Running 0 17s ## Troubleshooting -As of _v0.1.8_ and below, the **rke-bundle-cert** container is left over from a failed etcd restore. If you are having an issue with restoring an **etcd snapshot** then you can do the following on each etcd nodes before attempting to do another restore: +As of **v0.1.8** and below, the **rke-bundle-cert** container is left over from a failed etcd restore. If you are having an issue with restoring an **etcd snapshot** then you can do the following on each etcd nodes before attempting to do another restore: ``` docker container rm --force rke-bundle-cert ``` -The rke-bundle-cert container is usally removed when a backup or restore of **etcd** succeeds. +The rke-bundle-cert container is usually removed when a backup or restore of **etcd** succeeds. Whenever something goes wrong, the **rke-bundle-cert** container will be left over. You can look at the logs or inspect the container to see what the issue is. @@ -238,5 +238,5 @@ docker container inspect rke-bundle-cert The important thing to note is the mounts of the container and location of the **pki.bundle.tar.gz**. -As of _v0.1.9_, the **rke-bundle-cert** container is removed on both success and +As of **v0.1.9**, the **rke-bundle-cert** container is removed on both success and failure of a restore. To debug any issues, you will need to look at the **logs** generated from rke.