diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md index 41686fc0019..d248b360104 100644 --- a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md @@ -137,35 +137,6 @@ kubectl -n cattle-system apply -R -f ./rancher Make sure you follow any additional instructions required by SSL install options. See [Choose your SSL Configuration]({{< baseurl >}}rancher/v2.x/en/installation/ha/helm-rancher/#choose-your-ssl-configuration) for details. -## Upgrading Rancher - -Update the Rancher chart repo. - -```plain -helm repo update -``` - -Fetch the latest `rancher-stable/rancher` chart. This will pull down the chart and save it in the current directory as a `.tgz` file. - -```plain -helm fetch rancher-stable/rancher -``` - -Render the upgrade template using the same `--set` values you used for the install. Remember to set the `--is-upgrade` flag for `helm`. This will create a `rancher` directory with the Kubernetes manifest files. - -```plain -helm template ./rancher-.tgz --output-dir . --is-upgrade \ ---name rancher --namespace cattle-system \ ---set hostname= \ ---set rancherImage=/rancher/rancher -``` - -Copy the rendered manifests to a server with access to the Rancher server cluster and apply the rendered templates. - -```plain -kubectl -n cattle-system apply -R -f ./rancher -``` - {{% /tab %}} {{% tab "Single Node" %}} To deploy Rancher on a single node in an air gap environment, follow the instructions in the standard [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/). Parts of the install where you must complete a special action for air gap are flagged with a substitute step, which is listed in the subheading below. diff --git a/content/rancher/v2.x/en/upgrades/_index.md b/content/rancher/v2.x/en/upgrades/_index.md index 5bae1c7d09e..8e883988b5f 100644 --- a/content/rancher/v2.x/en/upgrades/_index.md +++ b/content/rancher/v2.x/en/upgrades/_index.md @@ -5,15 +5,9 @@ aliases: - /rancher/v2.x/en/backups/rollbacks/ --- -### Upgrading from Rancher 2.x.x +### Upgrading Rancher 2.x -Each new version of Rancher 2.x.x supports upgrades from previous versions of Rancher 2.x.x. This section will be updated as soon as the first release post 2.0 is available. - -Complete one of the upgrade procedures below based on your Rancher installation: - -- [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) +- [Upgrades]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/) ### Rolling Back Unsuccessful Upgrades @@ -24,8 +18,10 @@ In the event that your Rancher Server does not upgrade successfully, you can rol ### Migrating from Rancher 1.6.x -Until Rancher 2.1 is released, migrating to from Rancher 1.6.x to 2.x.x is not supported due to major code rewrites. +Since the underlying orchestration engine in Rancher is now Kubernetes, moving from 1.6 to 2.x is a migration process. -For the 2.1 release, we plan to release a tool that converts Rancher Compose to Kubernetes YAML. This tool will help our Cattle users migrate from Rancher 1.6.x to 2.x.x. However, we understand that there is a learning curve switching from Cattle to Kubernetes as you deploy new workloads. Therefore, this release will include a cheatsheet for those that enjoy Cattle's simplicity but want to quickly create those workloads in Kubernetes. +In general, we recommend creating a 2.x instance in parallel with your 1.6 instance. Launch new Kubernetes clusters for your workloads and migrate your workloads when they are ready. When all workloads are migrated retire the 1.6 instance and clusters. + +See our [From Cattle to K8s](https://rancher.com/tags/cattle-to-k8s/) series of articles for tools and information to help you update your workloads to run on Rancher 2.x and Kubernetes. We will continue support for Rancher 1.6.x for a minimum of one year after the 2.1 release so that 1.6.x users can plan and complete migration. \ No newline at end of file diff --git a/content/rancher/v2.x/en/upgrades/upgrades/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/_index.md index 82c89a8b925..c92ffb952e7 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/_index.md @@ -11,7 +11,8 @@ This section contains information about how to upgrade your Rancher server to a ### Upgrading to an HA Helm Chart -- [Upgrading from an HA Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/) +- [Upgrade an HA Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/) +- [Upgrade a Air Gap HA Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm-airgap/) - [Migrating from a RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) ### Upgrading an RKE Add-on Install diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm-airgap/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm-airgap/_index.md new file mode 100644 index 00000000000..b227cc657c7 --- /dev/null +++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm-airgap/_index.md @@ -0,0 +1,64 @@ +--- +title: High Availability (HA) Upgrade - Air Gap +weight: 1021 +--- + +The following instructions will guide you through upgrading a high-availability Rancher Server installed in an air gap environment. + +## Prerequisites + +- **Populate Images** + + Follow the guide to [Prepare the Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/) with the images for the upgrade Rancher release. + +- **Backup your Rancher Cluster** + + [Take a one-time snapshot]({{< baseurl >}}/rancher/v2.x/en/backups/backups/ha-backups/#option-b-one-time-snapshots) + of your Rancher Server cluster. You'll use the snapshot as a restoration point if something goes wrong during upgrade. + +- **kubectl** + + Follow the kubectl [configuration instructions]({{< baseurl >}}/rancher/v2.x/en/faq/kubectl) and confirm that you can connect to the Kubernetes cluster running Rancher server. + +- **helm** + + [Install or update](https://docs.helm.sh/using_helm/#installing-helm) Helm to the latest version. + +## Upgrade Rancher + +1. Update your local helm repo cache. + + ``` + helm repo update + ``` + +1. Fetch the latest `rancher-stable/rancher` chart. + + This will pull down the chart and save it in the current directory as a `.tgz` file. + + ```plain + helm fetch rancher-stable/rancher + ``` + +1. Render the upgrade template. + + Use the same `--set` values you used for the install. Remember to set the `--is-upgrade` flag for `helm`. This will create a `rancher` directory with the Kubernetes manifest files. + + ```plain + helm template ./rancher-.tgz --output-dir . --is-upgrade \ + --name rancher --namespace cattle-system \ + --set hostname= \ + --set rancherImage=/rancher/rancher + ``` + +1. Copy and apply the rendered manifests. + + Copy the files to a server with access to the Rancher server cluster and apply the rendered templates. + + ```plain + kubectl -n cattle-system apply -R -f ./rancher + ``` + +## Rolling Back + +Should something go wrong, follow the [HA Rollback]({{< baseurl >}}/rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/) instructions to restore the snapshot you took before you preformed the upgrade. diff --git a/content/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/_index.md index 62684f0a054..90033c3444a 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/_index.md @@ -1,5 +1,5 @@ --- -title: Single Node Air Gap Upgrade +title: Single Node Upgrade - Air Gap weight: 1011 aliases: - /rancher/v2.x/en/upgrades/air-gap-upgrade/