From 5a5ed49bc0104d067917ddc81c0ddc73fda5f51a Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 18 Oct 2018 11:49:50 -0700 Subject: [PATCH] updates per Denise --- .../air-gap-installation/install-rancher/_index.md | 4 ++-- .../rancher/v2.x/en/installation/ha/helm-rancher/_index.md | 2 +- content/rancher/v2.x/en/installation/server-tags/_index.md | 2 +- .../en/upgrades/upgrades/ha-server-upgrade-helm/_index.md | 5 +---- 4 files changed, 5 insertions(+), 8 deletions(-) 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 0808d5a3988..31115d326cf 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 @@ -82,7 +82,7 @@ Fetch and render the `helm` charts on a system that has internet access. If you are installing Rancher with Rancher self-signed certificates you will need to install 'cert-manager' on your cluster. If you are installing your own certificates you may skip this section. -Fetch the latest `cert-manager` chart from your Helm catalog. +Fetch the latest `cert-manager` chart from the [official Helm catalog](https://github.com/helm/charts/tree/master/stable). ```plain helm fetch stable/cert-manager @@ -98,7 +98,7 @@ helm template ./cert-manager-.tgz --output-dir . \ #### Rancher -Install the Rancher chart repo. Replace `` with the repository that you're using ('latest' or 'stable'). +Install the Rancher chart repo. Replace `` with the [repository that you're using]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#rancher-chart-repositories) ('latest' or 'stable'). ```plain helm repo add rancher- https://releases.rancher.com/server-charts/ diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md index 9a2b7830a7d..b5a65209d2d 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md @@ -39,7 +39,7 @@ rancher-latest/rancher 2018.10.1 v2.1.0 Install Rancher Serve Rancher relies on [cert-manager](https://github.com/kubernetes/charts/tree/master/stable/cert-manager) from the Kubernetes Helm stable catalog to issue self-signed or LetsEncrypt certificates. -Install `cert-manager` from your Helm catalog. +Install `cert-manager` from the [official Helm catalog](https://github.com/helm/charts/tree/master/stable). ``` 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 c46f16e76c6..0dff0b3d694 100644 --- a/content/rancher/v2.x/en/installation/server-tags/_index.md +++ b/content/rancher/v2.x/en/installation/server-tags/_index.md @@ -49,4 +49,4 @@ Instructions on when to make these configurations are available in [High Availab When installing Rancher in a high availability configuration, the latest version is used by default. However, if you want to install specific version of Rancher, you can set the `rancherImageTag` [option]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/#advanced-options). This option sets the version of Rancher that's deployed when you install by Helm chart. ->**Note:** The versions of Rancher available in [chart repository](#rancher-chart-repositories) are different. \ No newline at end of file +>**Note:** When using this option, you should avoid installing older versions of Rancher using newer Helm charts. \ No newline at end of file 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 35ce584dbd5..9a81b95187e 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 @@ -81,10 +81,7 @@ rancher-latest/rancher 2018.10.1 v2.1.0 Install Rancher Serve helm upgrade rancher rancher-/rancher --set hostname=rancher.my.org ``` - > **Important:** - > - >- For any values listed from Step 2, you must use `--set key=value` to apply the same values to the helm chart. - >- During upgrade, you must use the Rancher chart repository that you used during initial install (either the `stable` or `latest` repository). For more information, see [Choosing a Version of Rancher: Rancher Chart Repositories]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#rancher-chart-repositories). + > **Important:** For any values listed from Step 2, you must use `--set key=value` to apply the same values to the helm chart. ## Rolling Back