From 34d6c8bd4d2aee1579c1440c2bece439eb8563e0 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 30 Nov 2018 11:58:05 -0700 Subject: [PATCH 1/7] initial draft --- .../en/installation/server-tags/_index.md | 24 ++++++++++--------- .../ha-server-upgrade-helm-airgap/_index.md | 4 ++++ .../upgrades/ha-server-upgrade-helm/_index.md | 4 ++++ .../single-node-air-gap-upgrade/_index.md | 4 ++++ .../upgrades/single-node-upgrade/_index.md | 4 ++++ 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/content/rancher/v2.x/en/installation/server-tags/_index.md b/content/rancher/v2.x/en/installation/server-tags/_index.md index 785268f2f91..f87d1ffe00e 100644 --- a/content/rancher/v2.x/en/installation/server-tags/_index.md +++ b/content/rancher/v2.x/en/installation/server-tags/_index.md @@ -11,15 +11,17 @@ When performing [single-node installs]({{< baseurl >}}/rancher/v2.x/en/installat Rancher Server is distributed as a Docker image, which have tags attached to them. You can specify this tag when entering the command to deploy Rancher. Remember that if you use a tag without an explicit version (like `latest` or `stable`), you must explicitly pull a new version of that image tag. Otherwise, any image cached on the host will be used. -| Tag | Description | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `rancher/rancher:latest` | Our latest development release. These builds are validated through our CI automation framework. These releases are not recommended for production environments. | -| `rancher/rancher:stable` | Our newest stable release. This tag is recommended for production. | -| `rancher/rancher:` | You can install specific versions of Rancher by using the tag from a previous release. See what's available at DockerHub. | +Tag | Description +-------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- +`rancher/rancher:latest` | Our latest development release. These builds are validated through our CI automation framework. These releases are not recommended for production environments. +`rancher/rancher:stable` | Our newest stable release. This tag is recommended for production. +`rancher/rancher:` | You can install specific versions of Rancher by using the tag from a previous release. See what's available at DockerHub. +`rancher/rancher:alpha` | An alpha release for previewing upcoming releases. These releases are discouraged in production environments. -
- ->**Note:** The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. +>**Notes:** +> +>- Upgrading `rancher/rancher:alpha` installs to a general release tag is not supported. Additionally, alpha releases are only available in the `stable` [repository](#helm-chart-repositories), not `latest`. +>- The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. ## High Availability Installs @@ -51,10 +53,10 @@ Up until the initial release of the Helm chart for Rancher v2.1.0, the version o Since there are times where the Helm chart will require changes without any changes to the Rancher version, we have moved to a versioning scheme using `yyyy.mm.` for the Helm charts. -Run `helm search rancher` to view which Rancher version will be launched for the your Helm chart. +Run `helm search rancher` to view which Rancher version will be launched for the your Helm chart. ``` -NAME CHART VERSION APP VERSION DESCRIPTION +NAME CHART VERSION APP VERSION DESCRIPTION rancher-latest/rancher 2018.10.1 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... ``` @@ -67,7 +69,7 @@ After installing Rancher, if you want to change which Helm chart repository to i ``` helm repo list - NAME URL + NAME URL stable https://kubernetes-charts.storage.googleapis.com rancher- https://releases.rancher.com/server-charts/ ``` 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 index 40e061d4d07..62556e83536 100644 --- 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 @@ -27,6 +27,10 @@ The following instructions will guide you through upgrading a high-availability - **Upgrades to v2.0.7+ only: check system namespace locations** Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). +## Caveats + +Upgrading a Rancher Server running the `rancher/rancher:alpha` tag to a general release (i.e., `rancher/rancher:latest`) is not supported. + ## Upgrade Rancher 1. Update your local helm repo cache. diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md index 27df9bd9c4d..8e8be7cd95b 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md @@ -37,6 +37,10 @@ The following instructions will guide you through upgrading a high-availability - **Upgrades to v2.0.7+ only: check system namespace locations** Starting in v2.0.7, Rancher introduced the `System` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). +## Caveats + +Upgrading a Rancher Server running the `rancher/rancher:alpha` tag to a general release (i.e., `rancher/rancher:latest`) is not supported. + ## Upgrade Rancher > **Note:** For Air Gap installs see [Upgrading HA Rancher - Air Gap]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#upgrading-rancher) 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 726f9de0ad5..5d69b71ee93 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 @@ -9,6 +9,10 @@ To upgrade an air gapped Rancher Server, update your private registry with the l ## Prerequisites **Upgrades to v2.0.7+ only:** Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). +## Caveats + +Upgrading a Rancher Server running the `rancher/rancher:alpha` tag to a general release (i.e., `rancher/rancher:latest`) is not supported. + ## Upgrading An Air Gapped Rancher Server 1. Follow the directions in Air Gap Installation to [pull the Docker images]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/#release-files) required for the new version of Rancher. diff --git a/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md index 87ae47154a5..30c66846c80 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md @@ -35,6 +35,10 @@ You can obtain `` and `` by loggi ## Prerequisites **Upgrades to v2.0.7+ only:** Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). +## Caveats + +Upgrading a Rancher Server running the `rancher/rancher:alpha` tag to a general release (i.e., `rancher/rancher:latest`) is not supported. + ## Completing the Upgrade During upgrade, you create a copy of the data from your current Rancher container and a backup in case something goes wrong. Then you deploy the new version of Rancher in a new container using your existing data. From 0f2c9f8441a140fc35d609310f77ad0cf13a8b3d Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Mon, 3 Dec 2018 11:52:20 -0700 Subject: [PATCH 2/7] fixed incorrect alpha repo. also added note that alpha-to-alpha upgrades aren't supported --- content/rancher/v2.x/en/installation/server-tags/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/server-tags/_index.md b/content/rancher/v2.x/en/installation/server-tags/_index.md index f87d1ffe00e..1ced9a6e24a 100644 --- a/content/rancher/v2.x/en/installation/server-tags/_index.md +++ b/content/rancher/v2.x/en/installation/server-tags/_index.md @@ -20,7 +20,7 @@ Tag | Description >**Notes:** > ->- Upgrading `rancher/rancher:alpha` installs to a general release tag is not supported. Additionally, alpha releases are only available in the `stable` [repository](#helm-chart-repositories), not `latest`. +>- Upgrading `rancher/rancher:alpha` installs to a general release tag or another alpha build is not supported. Additionally, alpha releases are only available in the `latest` [repository](#helm-chart-repositories), not `stable`. >- The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. ## High Availability Installs From c18594a528309475cb7a3683612428e956864533 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Wed, 5 Dec 2018 11:57:07 -0700 Subject: [PATCH 3/7] adding alpha repo, removing alpha tag --- content/rancher/v2.x/en/installation/server-tags/_index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/server-tags/_index.md b/content/rancher/v2.x/en/installation/server-tags/_index.md index 1ced9a6e24a..89056916216 100644 --- a/content/rancher/v2.x/en/installation/server-tags/_index.md +++ b/content/rancher/v2.x/en/installation/server-tags/_index.md @@ -16,7 +16,7 @@ Tag | Description `rancher/rancher:latest` | Our latest development release. These builds are validated through our CI automation framework. These releases are not recommended for production environments. `rancher/rancher:stable` | Our newest stable release. This tag is recommended for production. `rancher/rancher:` | You can install specific versions of Rancher by using the tag from a previous release. See what's available at DockerHub. -`rancher/rancher:alpha` | An alpha release for previewing upcoming releases. These releases are discouraged in production environments. + >**Notes:** > @@ -42,6 +42,7 @@ Type | Command to Add the Repo | Description of the Repo -----------|-----|------------- rancher-latest | `helm repo add rancher-latest https://releases.rancher.com/server-charts/latest` | Adds a repository of Helm charts for the latest versions of Rancher. We recommend using this repo for testing out new Rancher builds. rancher-stable | `helm repo add rancher-stable https://releases.rancher.com/server-charts/stable` | Adds a repository of Helm charts for older, stable versions of Rancher. We recommend using this repo for production environments. +rancher-alpha | `helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha` | Adds a repository of Helm charts for alpha versions of Rancher for previewing upcoming releases. These releases are discouraged in production environments.
Instructions on when to select these repos are available below in [Switching to a Different Helm Chart Repository](#switching-to-a-different-helm-chart-repository). From 29960faa15fb0ed32374daaf3e941dbce12706b8 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Wed, 5 Dec 2018 12:21:15 -0700 Subject: [PATCH 4/7] adding content about how switching between repos isn't supported --- .../v2.x/en/installation/server-tags/_index.md | 13 ++++++++----- .../ha-server-upgrade-helm-airgap/_index.md | 2 +- .../upgrades/ha-server-upgrade-helm/_index.md | 2 +- .../upgrades/single-node-air-gap-upgrade/_index.md | 2 +- .../upgrades/upgrades/single-node-upgrade/_index.md | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/content/rancher/v2.x/en/installation/server-tags/_index.md b/content/rancher/v2.x/en/installation/server-tags/_index.md index 89056916216..1b53dc4e545 100644 --- a/content/rancher/v2.x/en/installation/server-tags/_index.md +++ b/content/rancher/v2.x/en/installation/server-tags/_index.md @@ -18,10 +18,7 @@ Tag | Description `rancher/rancher:` | You can install specific versions of Rancher by using the tag from a previous release. See what's available at DockerHub. ->**Notes:** -> ->- Upgrading `rancher/rancher:alpha` installs to a general release tag or another alpha build is not supported. Additionally, alpha releases are only available in the `latest` [repository](#helm-chart-repositories), not `stable`. ->- The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. +>**Notes:** The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. ## High Availability Installs @@ -29,6 +26,7 @@ When installing, upgrading, or rolling back Rancher Server in a [high availabili ### Helm Chart Repositories +<<<<<<< HEAD Rancher provides two different Helm chart repositories to choose from. We align our latest and stable Helm chart repositories with the Docker tags that are used for a single node installation. @@ -37,12 +35,15 @@ When a Rancher version has been promoted to the `rancher/rancher:stable`, it wil Each Helm chart repository is named for the labels attached to each Rancher image. In other words, the `rancher-latest` repository contains charts labeled as `rancher/rancher:latest`, the `rancher-stable` repository contains charts labeled `rancher/rancher:stable`, etc.) +======= +Rancher provides several different Helm chart repositories to choose from. We align our latest and stable Helm chart repositories with the Docker tags that are used for a single node installation. Therefore, the `rancher-latest` repository will contain charts for all the Rancher versions that have been tagged as `rancher/rancher:latest`. When a Rancher version has been promoted to the `rancher/rancher:stable`, it will get added to the `rancher-stable` repository. +>>>>>>> adding content about how switching between repos isn't supported Type | Command to Add the Repo | Description of the Repo -----------|-----|------------- rancher-latest | `helm repo add rancher-latest https://releases.rancher.com/server-charts/latest` | Adds a repository of Helm charts for the latest versions of Rancher. We recommend using this repo for testing out new Rancher builds. rancher-stable | `helm repo add rancher-stable https://releases.rancher.com/server-charts/stable` | Adds a repository of Helm charts for older, stable versions of Rancher. We recommend using this repo for production environments. -rancher-alpha | `helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha` | Adds a repository of Helm charts for alpha versions of Rancher for previewing upcoming releases. These releases are discouraged in production environments. +rancher-alpha | `helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha` | Adds a repository of Helm charts for alpha versions of Rancher for previewing upcoming releases. These releases are discouraged in production environments. Upgrading builds from from this repository to any other build, regardless of repository, is not supported.
Instructions on when to select these repos are available below in [Switching to a Different Helm Chart Repository](#switching-to-a-different-helm-chart-repository). @@ -65,6 +66,8 @@ rancher-latest/rancher 2018.10.1 v2.1.0 Install Rancher Serve After installing Rancher, if you want to change which Helm chart repository to install Rancher from, you will need to follow these steps. +>**Note:** Because the rancher-alpha repository contains only preview builds, switching from the rancher-alpha repository to rancher-stable or rancher-latest for upgrades is not supported. + 1. List the current Helm chart repositories. ``` 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 index 62556e83536..166684f8376 100644 --- 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 @@ -29,7 +29,7 @@ The following instructions will guide you through upgrading a high-availability ## Caveats -Upgrading a Rancher Server running the `rancher/rancher:alpha` tag to a general release (i.e., `rancher/rancher:latest`) is not supported. +Running a build from the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/)? Sorry, but upgrading from an alpha build isn't supported 😞. ## Upgrade Rancher diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md index 8e8be7cd95b..d505208ad5d 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md @@ -39,7 +39,7 @@ The following instructions will guide you through upgrading a high-availability ## Caveats -Upgrading a Rancher Server running the `rancher/rancher:alpha` tag to a general release (i.e., `rancher/rancher:latest`) is not supported. +Running a build from the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/)? Sorry, but upgrading from an alpha build isn't supported 😞. ## Upgrade Rancher 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 5d69b71ee93..1da12f86850 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 @@ -11,7 +11,7 @@ To upgrade an air gapped Rancher Server, update your private registry with the l ## Caveats -Upgrading a Rancher Server running the `rancher/rancher:alpha` tag to a general release (i.e., `rancher/rancher:latest`) is not supported. +Running a build from the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/)? Sorry, but upgrading from an alpha build isn't supported 😞. ## Upgrading An Air Gapped Rancher Server diff --git a/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md index 30c66846c80..fa267832368 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md @@ -37,7 +37,7 @@ You can obtain `` and `` by loggi ## Caveats -Upgrading a Rancher Server running the `rancher/rancher:alpha` tag to a general release (i.e., `rancher/rancher:latest`) is not supported. +Running a build from the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/)? Sorry, but upgrading from an alpha build isn't supported 😞. ## Completing the Upgrade From 8dbe2defbc08199817d44ff29bf45d7bd89569f5 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Dec 2018 12:15:20 -0700 Subject: [PATCH 5/7] adding back alpha tag, differentiating between tags in single node and repos in ha --- content/rancher/v2.x/en/installation/server-tags/_index.md | 6 ++++-- .../upgrades/ha-server-upgrade-helm-airgap/_index.md | 3 +-- .../en/upgrades/upgrades/ha-server-upgrade-helm/_index.md | 3 +-- .../upgrades/upgrades/single-node-air-gap-upgrade/_index.md | 4 ++-- .../v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/content/rancher/v2.x/en/installation/server-tags/_index.md b/content/rancher/v2.x/en/installation/server-tags/_index.md index 1b53dc4e545..d6775f127da 100644 --- a/content/rancher/v2.x/en/installation/server-tags/_index.md +++ b/content/rancher/v2.x/en/installation/server-tags/_index.md @@ -16,6 +16,8 @@ Tag | Description `rancher/rancher:latest` | Our latest development release. These builds are validated through our CI automation framework. These releases are not recommended for production environments. `rancher/rancher:stable` | Our newest stable release. This tag is recommended for production. `rancher/rancher:` | You can install specific versions of Rancher by using the tag from a previous release. See what's available at DockerHub. +`rancher/rancher:alpha` | Alpha version of Rancher for previewing an upcoming release. These releases are discouraged in production environments. Upgrading to or from releases with an alpha tag is not supported. + >**Notes:** The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. @@ -43,7 +45,7 @@ Type | Command to Add the Repo | Description of the Repo -----------|-----|------------- rancher-latest | `helm repo add rancher-latest https://releases.rancher.com/server-charts/latest` | Adds a repository of Helm charts for the latest versions of Rancher. We recommend using this repo for testing out new Rancher builds. rancher-stable | `helm repo add rancher-stable https://releases.rancher.com/server-charts/stable` | Adds a repository of Helm charts for older, stable versions of Rancher. We recommend using this repo for production environments. -rancher-alpha | `helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha` | Adds a repository of Helm charts for alpha versions of Rancher for previewing upcoming releases. These releases are discouraged in production environments. Upgrading builds from from this repository to any other build, regardless of repository, is not supported. +rancher-alpha | `helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha` | Adds a repository of Helm charts for alpha versions of Rancher for previewing upcoming releases. These releases are discouraged in production environments. Upgrading to or from builds from from this repository to any other build, regardless of repository, is not supported.
Instructions on when to select these repos are available below in [Switching to a Different Helm Chart Repository](#switching-to-a-different-helm-chart-repository). @@ -66,7 +68,7 @@ rancher-latest/rancher 2018.10.1 v2.1.0 Install Rancher Serve After installing Rancher, if you want to change which Helm chart repository to install Rancher from, you will need to follow these steps. ->**Note:** Because the rancher-alpha repository contains only preview builds, switching from the rancher-alpha repository to rancher-stable or rancher-latest for upgrades is not supported. +>**Note:** Because the rancher-alpha repository contains only alpha builds, switching from the rancher-alpha repository to rancher-stable or rancher-latest for upgrades is not supported. 1. List the current Helm chart repositories. 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 index 166684f8376..8beb8e6d609 100644 --- 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 @@ -28,8 +28,7 @@ The following instructions will guide you through upgrading a high-availability Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). ## Caveats - -Running a build from the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/)? Sorry, but upgrading from an alpha build isn't supported 😞. +Upgrades _to_ or _from_ any release in the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/) aren't supported. ## Upgrade Rancher diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md index d505208ad5d..65b7ee9aa47 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md @@ -38,8 +38,7 @@ The following instructions will guide you through upgrading a high-availability Starting in v2.0.7, Rancher introduced the `System` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). ## Caveats - -Running a build from the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/)? Sorry, but upgrading from an alpha build isn't supported 😞. +Upgrades _to_ or _from_ any release in the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/) aren't supported. ## Upgrade Rancher 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 1da12f86850..39ecb6d7ac3 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 @@ -9,9 +9,9 @@ To upgrade an air gapped Rancher Server, update your private registry with the l ## Prerequisites **Upgrades to v2.0.7+ only:** Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). -## Caveats -Running a build from the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/)? Sorry, but upgrading from an alpha build isn't supported 😞. +## Caveats +Upgrades _to_ or _from_ any build with the [alpha tag]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#server-tags) aren't supported. ## Upgrading An Air Gapped Rancher Server diff --git a/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md index fa267832368..cf7708daa14 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md @@ -36,8 +36,7 @@ You can obtain `` and `` by loggi **Upgrades to v2.0.7+ only:** Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). ## Caveats - -Running a build from the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/)? Sorry, but upgrading from an alpha build isn't supported 😞. +Upgrades _to_ or _from_ any build with the [alpha tag]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#server-tags) aren't supported. ## Completing the Upgrade From 34fd09679814aefd7ce4cc5b9beff3d8f4205a88 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Dec 2018 12:50:01 -0700 Subject: [PATCH 6/7] changes for Denise's feedback --- .../rancher/v2.x/en/installation/server-tags/_index.md | 9 +++++---- .../upgrades/ha-server-upgrade-helm-airgap/_index.md | 2 +- .../upgrades/upgrades/ha-server-upgrade-helm/_index.md | 2 +- .../upgrades/single-node-air-gap-upgrade/_index.md | 2 +- .../en/upgrades/upgrades/single-node-upgrade/_index.md | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/content/rancher/v2.x/en/installation/server-tags/_index.md b/content/rancher/v2.x/en/installation/server-tags/_index.md index d6775f127da..d9530b46ca1 100644 --- a/content/rancher/v2.x/en/installation/server-tags/_index.md +++ b/content/rancher/v2.x/en/installation/server-tags/_index.md @@ -16,11 +16,11 @@ Tag | Description `rancher/rancher:latest` | Our latest development release. These builds are validated through our CI automation framework. These releases are not recommended for production environments. `rancher/rancher:stable` | Our newest stable release. This tag is recommended for production. `rancher/rancher:` | You can install specific versions of Rancher by using the tag from a previous release. See what's available at DockerHub. -`rancher/rancher:alpha` | Alpha version of Rancher for previewing an upcoming release. These releases are discouraged in production environments. Upgrading to or from releases with an alpha tag is not supported. ->**Notes:** The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. + +>**Note:** The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. ## High Availability Installs @@ -45,7 +45,8 @@ Type | Command to Add the Repo | Description of the Repo -----------|-----|------------- rancher-latest | `helm repo add rancher-latest https://releases.rancher.com/server-charts/latest` | Adds a repository of Helm charts for the latest versions of Rancher. We recommend using this repo for testing out new Rancher builds. rancher-stable | `helm repo add rancher-stable https://releases.rancher.com/server-charts/stable` | Adds a repository of Helm charts for older, stable versions of Rancher. We recommend using this repo for production environments. -rancher-alpha | `helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha` | Adds a repository of Helm charts for alpha versions of Rancher for previewing upcoming releases. These releases are discouraged in production environments. Upgrading to or from builds from from this repository to any other build, regardless of repository, is not supported. +rancher-alpha | `helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha` | Adds a repository of Helm charts for alpha versions of Rancher for previewing upcoming releases. These releases are discouraged in production environments. Upgrades _to_ or _from_ charts in the rancher-alpha repository to any other chart, regardless or repository, aren't supported. +
Instructions on when to select these repos are available below in [Switching to a Different Helm Chart Repository](#switching-to-a-different-helm-chart-repository). @@ -68,7 +69,7 @@ rancher-latest/rancher 2018.10.1 v2.1.0 Install Rancher Serve After installing Rancher, if you want to change which Helm chart repository to install Rancher from, you will need to follow these steps. ->**Note:** Because the rancher-alpha repository contains only alpha builds, switching from the rancher-alpha repository to rancher-stable or rancher-latest for upgrades is not supported. +>**Note:** Because the rancher-alpha repository contains only alpha charts, switching between the rancher-alpha repository and the rancher-stable or rancher-latest repository for upgrades is not supported. 1. List the current Helm chart repositories. 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 index 8beb8e6d609..73eb941ac9f 100644 --- 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 @@ -28,7 +28,7 @@ The following instructions will guide you through upgrading a high-availability Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). ## Caveats -Upgrades _to_ or _from_ any release in the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/) aren't supported. +Upgrades _to_ or _from_ any chart in the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/) aren't supported. ## Upgrade Rancher diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md index 65b7ee9aa47..a758fa1d1cb 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md @@ -38,7 +38,7 @@ The following instructions will guide you through upgrading a high-availability Starting in v2.0.7, Rancher introduced the `System` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). ## Caveats -Upgrades _to_ or _from_ any release in the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/) aren't supported. +Upgrades _to_ or _from_ any chart in the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/) aren't supported. ## Upgrade Rancher 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 39ecb6d7ac3..a2cf879b84a 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 @@ -11,7 +11,7 @@ To upgrade an air gapped Rancher Server, update your private registry with the l ## Caveats -Upgrades _to_ or _from_ any build with the [alpha tag]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#server-tags) aren't supported. +Upgrades _to_ or _from_ any tag containing [alpha]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#server-tags) aren't supported. ## Upgrading An Air Gapped Rancher Server diff --git a/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md index cf7708daa14..76473ff51da 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/single-node-upgrade/_index.md @@ -36,7 +36,7 @@ You can obtain `` and `` by loggi **Upgrades to v2.0.7+ only:** Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). ## Caveats -Upgrades _to_ or _from_ any build with the [alpha tag]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#server-tags) aren't supported. +Upgrades _to_ or _from_ any tag containing [alpha]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#server-tags) aren't supported. ## Completing the Upgrade From badb6e8cc01427d331befe685f81bba0052554a9 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Dec 2018 13:09:38 -0700 Subject: [PATCH 7/7] updaing alpha tag note --- .../en/installation/server-tags/_index.md | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/content/rancher/v2.x/en/installation/server-tags/_index.md b/content/rancher/v2.x/en/installation/server-tags/_index.md index d9530b46ca1..f7776f4eee6 100644 --- a/content/rancher/v2.x/en/installation/server-tags/_index.md +++ b/content/rancher/v2.x/en/installation/server-tags/_index.md @@ -20,7 +20,13 @@ Tag | Description ->**Note:** The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. +>**Notes:** +> +>- The `master` tag or any tag with `-rc` or another suffix is meant for the Rancher testing team to validate. You should not use these tags, as these builds are not officially supported. +>- Want to install an alpha review for preview? Install using one of the alpha tags listed on our [announcements page](https://forums.rancher.com/c/announcements) (e.g., `v2.2.0-alpha1`). +> +> _Caveat:_ Alpha releases cannot be upgraded to or from any other release. + ## High Availability Installs @@ -28,18 +34,7 @@ When installing, upgrading, or rolling back Rancher Server in a [high availabili ### Helm Chart Repositories -<<<<<<< HEAD -Rancher provides two different Helm chart repositories to choose from. - -We align our latest and stable Helm chart repositories with the Docker tags that are used for a single node installation. -Therefore, the `rancher-latest` repository will contain charts for all the Rancher versions that have been tagged as `rancher/rancher:latest`. -When a Rancher version has been promoted to the `rancher/rancher:stable`, it will get added to the `rancher-stable` repository. - -Each Helm chart repository is named for the labels attached to each Rancher image. In other words, the `rancher-latest` repository contains charts labeled as `rancher/rancher:latest`, the `rancher-stable` repository -contains charts labeled `rancher/rancher:stable`, etc.) -======= Rancher provides several different Helm chart repositories to choose from. We align our latest and stable Helm chart repositories with the Docker tags that are used for a single node installation. Therefore, the `rancher-latest` repository will contain charts for all the Rancher versions that have been tagged as `rancher/rancher:latest`. When a Rancher version has been promoted to the `rancher/rancher:stable`, it will get added to the `rancher-stable` repository. ->>>>>>> adding content about how switching between repos isn't supported Type | Command to Add the Repo | Description of the Repo -----------|-----|-------------