From 75540c14d032df382dbbb99e5a8f6eb41ba2ca2e Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Mon, 27 Aug 2018 15:25:39 -0700 Subject: [PATCH] edited upgrade scenario menu --- .../rancher/v2.x/en/upgrades/upgrades/_index.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/content/rancher/v2.x/en/upgrades/upgrades/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/_index.md index f9d839a4450..82c89a8b925 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/_index.md @@ -9,19 +9,12 @@ This section contains information about how to upgrade your Rancher server to a - [Upgrading a Single Node Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/) - [Upgrading an Air Gapped Single Node Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/) -### HA Install with Helm Chart -<<<<<<< HEAD -======= +### Upgrading to an HA Helm Chart ->>>>>>> editing and formatting for helm upgrade -- [Upgrading a High Availability Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/) +- [Upgrading from an HA Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/) +- [Migrating from a RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) -### HA Install with RKE Add-On yaml +### Upgrading an RKE Add-on Install -<<<<<<< HEAD -- [Migrating from a High Availability RKE Add-on Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) - [Upgrading a High Availability Install - RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/) -======= -- [Migrating from a High Availability RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) -- [Upgrading a High Availability Install - RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/) ->>>>>>> editing and formatting for helm upgrade +