From 34fd09679814aefd7ce4cc5b9beff3d8f4205a88 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Dec 2018 12:50:01 -0700 Subject: [PATCH] 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