From 0844b39ec3b2daa1f2dd2f09acafa34704d55469 Mon Sep 17 00:00:00 2001 From: Jason Greathouse Date: Mon, 8 Oct 2018 16:04:43 -0500 Subject: [PATCH 1/6] api, additional ca certs, external tls deprecation --- .../ha/helm-rancher/chart-options/_index.md | 89 +++++++++++++++---- 1 file changed, 74 insertions(+), 15 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md index 0320c17cd08..c19efe4f299 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md @@ -19,7 +19,13 @@ weight: 276 | Option | Default Value | Description | | --- | --- | --- | +| `additionalTrustedCAs` | false | `bool` - See [Additional Trusted CAs](#additional-trusted-cas) | +| `auditLog.destination` | "sidecar" | `string` - Stream to sidecar container console or hostPath volume - "sidecar, hostPath" | +| `auditLog.hostPath` | "/var/log/rancher/audit" | `string` - log file destination on host | | `auditLog.level` | 0 | `int` - set the [API Audit Log]({{< baseurl >}}/rancher/v2.x/en/installation/api-auditing) level. 0 is off. [0-3] | +| `auditLog.maxAge` | 1 | `int` - maximum number of days to retain old audit log files | +| `auditLog.maxBackups` | 1 | `int` - maximum number of audit log files to retain | +| `auditLog.maxSize` | 100 | `int` - maximum size in megabytes of the audit log file before it gets rotated | | `debug` | false | `bool` - set debug flag on rancher server | | `imagePullSecrets` | [] | `list` - list of names of Secret resource containing private registry credentials | | `proxy` | "" | `string` - string - HTTP[S] proxy server for Rancher | @@ -27,52 +33,105 @@ weight: 276 | `resources` | {} | `map` - rancher pod resource requests & limits | | `rancherImage` | "rancher/rancher" | `string` - rancher image source | | `rancherImageTag` | same as chart version | `string` - rancher/rancher image tag | -| `tls` | "ingress" | `string` - Where to terminate SSL. - "ingress, external" | +| `tls` | "ingress" | `string` - **DEPRECATED**: Changing this option is not recommended. See [External TLS Termination](#external-tls-termination) for details. - "ingress, external" |
### API Audit Log -Enabling the [API Audit Log](https://rancher.com/docs/rancher/v2.x/en/installation/api-auditing/) will create a sidecar container in the Rancher pod. This container (`rancher-audit-log`) will stream the log to `stdout`. +Enabling the [API Audit Log](https://rancher.com/docs/rancher/v2.x/en/installation/api-auditing/). You can collect this log as you would any container log. Enable the [Logging service under Rancher Tools](https://rancher.com/docs/rancher/v2.x/en/tools/logging/) for the `System` Project on the Rancher server cluster. -``` +```plain --set auditLog.level=1 ``` +By default enabling Audit Logging will create a sidecar container in the Rancher pod. This container (`rancher-audit-log`) will stream the log to `stdout`. You can collect this log as you would any container log. Enable the [Logging service under Rancher Tools](https://rancher.com/docs/rancher/v2.x/en/tools/logging/) for the Rancher server cluster or System Project. + +Set the `auditLog.destination` to `hostPath` to forward logs to volume shared with the host system instead of streaming to a sidecar container. When setting the destination to `hostPath` you may want to adjust the other auditLog parameters for log rotation. + ### HTTP Proxy Rancher requires internet access for some functionality (helm charts). Use `proxy` to set your proxy server. Add your IP exceptions to the `noProxy` list. Make sure you add the Service cluster IP range (default: 10.43.0.1/16) and any worker cluster `controlplane` nodes. Rancher supports CIDR notation ranges in this list. -``` +```plain --set proxy="http://:@:/" --set noProxy="127.0.0.1,localhost,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16" ``` +### Additional Trusted CAs + +If you have private registries, catalogs or a proxy that intercepts certificates, you may need to add additional trusted CAs to Rancher. + +```plain +--set additionalTrustedCAs=true +``` + +Once the Rancher deployment is created, copy your CA certs in pem format into a file named `ca-additional.pem` and use `kubectl` to create the `tls-ca-additional` secret in the `cattle-system` namespace. + +```plain +kubectl -n cattle-system create secret generic tls-ca-additional --from-file=ca-additional.pem +``` + ### Private Registry and Air Gap Installs See [Installing Rancher - Air Gap]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/) for details on installing Rancher with a private registry. ### External TLS Termination -If you wish to terminate the SSL/TLS on a load-balancer external to the Rancher cluster (ingress), use the `--tls=external` option and point your load balancer at port http 80 on all of the rancher cluster nodes. +Due to security concerns and configuration variability, terminating TLS exclusively on an external load balancer is being deprecated. This option will be removed in future versions of the Helm chart. -> **Note:** If you are using a Private CA signed cert, add `--set privateCA=true` and see [Adding TLS Secrets - Private CA Signed - Additional Steps]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/#private-ca-signed---additional-steps) to add the CA cert for Rancher. +We recommend configuring your load balancer as a Layer 4 balancer, forwarding plain 80/tcp and 443/tcp to the Rancher Management cluster nodes. The Ingress Controller on the cluster will redirect http traffic on port 80 to https on port 443. -Your load balancer must support long lived websocket connections and will need to insert proxy headers so Rancher can route links correctly. +You may configure your load balancer as a Layer 7 balancer with a SSL/TLS certificate, but you will need to configure the load balancer to forward to the https endpoints on the Rancher Management Cluster nodes. -> **Note:** The `tls=external` option will expose the Rancher interface on http port 80. Clients that are allowed to connect directly to the Rancher cluster will not be encrypted. We recommend that you restrict direct access at the network level to just your load balancer. +#### Conversion -#### Required headers +##### Certificates -* `Host` -* `X-Forwarded-Proto` -* `X-Forwarded-Port` -* `X-Forwarded-For` +Make sure you have a copy of the following: -#### Health checks +* Server Certificate +* Server Certificate Private Key +* Any Chain Certificates +* Private CA Root Certificate (if Private CA) -Rancher will respond `200` to health checks on the `/healthz` endpoint. +The certificate doesn't need to be the same one used by the external load balancer, but it can be. If you creating a new certificate and used a Private CA to sign the certificate installed on the external load balancer, use the same CA to sign the new certificate. + +##### Gather Chart Options + +The Helm chart options for setting up TLS with provided certificates can be found in the [Install Rancher - Certificates from Files (Kubernetes Secrets)]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/#certificates-from-files-kubernetes-secret) section. + +In general you will need to swap out: + +```plain +--set tls=external +``` + +With: + +```plain + --set ingress.tls.source=secret +``` + +> **Note:** if your certificates are signed by a private CA don't forget to add the `--set privateCA=true` option. + +##### Upgrade + +Once you have selected the `helm --set` options for your SSL configuration, follow the [Rancher Upgrade]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm) instructions replacing the deprecated chart options with the new configuration. + +Example with privateCA option: + +```plain +helm upgrade rancher rancher-stable/rancher \ + --set hostname=rancher.my.org \ + --set ingress.tls.source=secret \ + --set privateCA=true +``` + +##### Populate Certificate Secrets + +The Ingress controller will wait until you have populated the certificate secrets before serving the Rancher application. See [Adding TLS Secrets]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/) for details. From 5ab5328c43c8dfb89c31b72f7ae310744d67ffe3 Mon Sep 17 00:00:00 2001 From: Jason Greathouse Date: Wed, 10 Oct 2018 19:23:28 -0500 Subject: [PATCH 2/6] remove deprecation warning --- .../ha/helm-rancher/chart-options/_index.md | 59 +++++-------------- 1 file changed, 15 insertions(+), 44 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md index c19efe4f299..d94356b3115 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md @@ -33,7 +33,7 @@ weight: 276 | `resources` | {} | `map` - rancher pod resource requests & limits | | `rancherImage` | "rancher/rancher" | `string` - rancher image source | | `rancherImageTag` | same as chart version | `string` - rancher/rancher image tag | -| `tls` | "ingress" | `string` - **DEPRECATED**: Changing this option is not recommended. See [External TLS Termination](#external-tls-termination) for details. - "ingress, external" | +| `tls` | "ingress" | `string` - See [External TLS Termination](#external-tls-termination) for details. - "ingress, external" |
@@ -82,56 +82,27 @@ See [Installing Rancher - Air Gap]({{< baseurl >}}/rancher/v2.x/en/installation/ ### External TLS Termination -Due to security concerns and configuration variability, terminating TLS exclusively on an external load balancer is being deprecated. This option will be removed in future versions of the Helm chart. - We recommend configuring your load balancer as a Layer 4 balancer, forwarding plain 80/tcp and 443/tcp to the Rancher Management cluster nodes. The Ingress Controller on the cluster will redirect http traffic on port 80 to https on port 443. -You may configure your load balancer as a Layer 7 balancer with a SSL/TLS certificate, but you will need to configure the load balancer to forward to the https endpoints on the Rancher Management Cluster nodes. +You may terminate the SSL/TLS on a L7 load balancer external to the Rancher cluster (ingress). Use the `--tls=external` option and point your load balancer at port http 80 on all of the Rancher cluster nodes. This will expose the Rancher interface on http port 80. Be aware that clients that are allowed to connect directly to the Rancher cluster will not be encrypted. If you choose to do this we recommend that you restrict direct access at the network level to just your load balancer. -#### Conversion +> **Note:** If you are using a Private CA signed cert, add `--set privateCA=true` and see [Adding TLS Secrets - Private CA Signed - Additional Steps]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/#private-ca-signed---additional-steps) to add the CA cert for Rancher. -##### Certificates +Your load balancer must support long lived websocket connections and will need to insert proxy headers so Rancher can route links correctly. -Make sure you have a copy of the following: +#### Required Headers -* Server Certificate -* Server Certificate Private Key -* Any Chain Certificates -* Private CA Root Certificate (if Private CA) +* `Host` +* `X-Forwarded-Proto` +* `X-Forwarded-Port` +* `X-Forwarded-For` -The certificate doesn't need to be the same one used by the external load balancer, but it can be. If you creating a new certificate and used a Private CA to sign the certificate installed on the external load balancer, use the same CA to sign the new certificate. +#### Recommended Timeouts -##### Gather Chart Options +* Read Timeout: `1800 seconds` +* Write Timeout: `1800 seconds` +* Connect Timeout: `30 seconds` -The Helm chart options for setting up TLS with provided certificates can be found in the [Install Rancher - Certificates from Files (Kubernetes Secrets)]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/#certificates-from-files-kubernetes-secret) section. +#### Health Checks -In general you will need to swap out: - -```plain ---set tls=external -``` - -With: - -```plain - --set ingress.tls.source=secret -``` - -> **Note:** if your certificates are signed by a private CA don't forget to add the `--set privateCA=true` option. - -##### Upgrade - -Once you have selected the `helm --set` options for your SSL configuration, follow the [Rancher Upgrade]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm) instructions replacing the deprecated chart options with the new configuration. - -Example with privateCA option: - -```plain -helm upgrade rancher rancher-stable/rancher \ - --set hostname=rancher.my.org \ - --set ingress.tls.source=secret \ - --set privateCA=true -``` - -##### Populate Certificate Secrets - -The Ingress controller will wait until you have populated the certificate secrets before serving the Rancher application. See [Adding TLS Secrets]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/) for details. +Rancher will respond `200` to health checks on the `/healthz` endpoint. From 9ec2a38b94a4f7d7773ff835ddcf0a1d3931b3ce Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 10 Oct 2018 22:39:02 -0700 Subject: [PATCH 3/6] cleaning up upgrade doc for the helm chart --- .../v2.x/en/installation/ha/helm-rancher/_index.md | 12 ++++++------ .../upgrades/ha-server-upgrade-helm/_index.md | 8 ++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) 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 57dade23699..6672db37c37 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 @@ -21,7 +21,7 @@ For additional chart details, view the [source of these Rancher server charts](h > **Note:** cert-manager is only required for Rancher generated and LetsEncrypt issued certificates. You may skip this step if you are bringing your own certificates and using the `ingress.tls.source=secret` option. -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. +Rancher relies on [cert-manager](https://github.com/kubernetes/charts/tree/master/stable/cert-manager) from the [Kubernetes Helm stable catalog](https://github.com/helm/charts/tree/master/stable/cert-manager) to issue self-signed or LetsEncrypt certificates. Install `cert-manager` from the Helm stable catalog. @@ -33,7 +33,7 @@ helm install stable/cert-manager \ ### Choose your SSL Configuration -Rancher server is designed to be "secure by default" and requires SSL/TLS configuration. +Rancher server is designed to be secure by default and requires SSL/TLS configuration. There are three options for the source of the certificate. @@ -47,7 +47,7 @@ There are three options for the source of the certificate. The default is for Rancher to generate a CA and use the `cert-manager` to issue the certificate for access to the Rancher server interface. -The only requirement is to set the `hostname` to the DNS name you pointed at your Load Balancer. +The only requirement is to set the `hostname` to the DNS name you pointed at your load balancer. >**Using Air Gap?** [Set the `rancherImage` option]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#install-rancher-using-private-registry) in your command, pointing toward your private registry. @@ -77,11 +77,11 @@ helm install rancher-stable/rancher \ #### Certificates from Files (Kubernetes Secret) -Create Kubernetes Secrets from your own certificates for Rancher to use. +Create Kubernetes secrets from your own certificates for Rancher to use. > **Note:** The common name for the cert will need to match the `hostname` option or the ingress controller will fail to provision the site for Rancher. -Set `hostname` and `ingress.tls.source=secret` +Set `hostname` and `ingress.tls.source=secret`. > **Note:** If you are using a Private CA signed cert, add `--set privateCA=true` @@ -93,7 +93,7 @@ helm install rancher-stable/rancher \ --set ingress.tls.source=secret ``` -Now that Rancher is running, see [Adding TLS Secrets]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/) to publish the certificate files so Rancher and the Ingress Controller can use them. +Now that Rancher is running, see [Adding TLS Secrets]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/) to publish the certificate files so Rancher and the ingress controller can use them. ### Advanced Configurations 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 62e96cb3bf9..30610d00a90 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 @@ -26,7 +26,7 @@ The following instructions will guide you through upgrading a high-availability 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** +- **Helm** [Install or update](https://docs.helm.sh/using_helm/#installing-helm) Helm to the latest version. @@ -56,11 +56,15 @@ The following instructions will guide you through upgrading a high-availability hostname: rancher.my.org ``` -3. Take the values above and use `helm` with `--set` options to upgrade Rancher to the latest version. +> **Note:** There may be more values that are listed with this command depending on which [SSL configuration option you selected]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/#choose-your-ssl-configuration) when installing Rancher. + +3. Take all values from the previous command and use `helm` with `--set` options to upgrade Rancher to the latest version. ``` helm upgrade rancher rancher-stable/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. ## Rolling Back From 7f80466b22337d49cc618348aca3d8537a39fc5f Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 10 Oct 2018 22:54:48 -0700 Subject: [PATCH 4/6] spacing issue --- .../en/upgrades/upgrades/ha-server-upgrade-helm/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 30610d00a90..80800ba870f 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 @@ -56,15 +56,15 @@ The following instructions will guide you through upgrading a high-availability hostname: rancher.my.org ``` -> **Note:** There may be more values that are listed with this command depending on which [SSL configuration option you selected]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/#choose-your-ssl-configuration) when installing Rancher. + > **Note:** There may be more values that are listed with this command depending on which [SSL configuration option you selected]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/#choose-your-ssl-configuration) when installing Rancher. 3. Take all values from the previous command and use `helm` with `--set` options to upgrade Rancher to the latest version. ``` helm upgrade rancher rancher-stable/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. + + > **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 From 5f561254cc57205339f8848bcdccaf626dc29621 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 10 Oct 2018 23:12:25 -0700 Subject: [PATCH 5/6] adding notes about helm chart version --- .../en/installation/ha/helm-rancher/_index.md | 13 +++++++++++++ .../ha-server-upgrade-helm-airgap/_index.md | 15 +++++++++++++++ .../upgrades/ha-server-upgrade-helm/_index.md | 15 +++++++++++++++ 3 files changed, 43 insertions(+) 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 6672db37c37..2333ba6483d 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 @@ -15,6 +15,19 @@ Use `helm repo add` to add the Rancher chart repository. helm repo add rancher-stable https://releases.rancher.com/server-charts/stable ``` +## Chart Versioning Notes + +Up until the initial helm chart release for v2.1.0, the helm chart version matched the Rancher version (i.e `appVersion`). + +Since there are times where the helm chart will require changes without any changes to the Rancher version, we have moved to a `yy.mm.dd` helm chart version. + +Run `helm search rancher` to view which Rancher version will be launched for the specific helm chart version. + +``` +NAME CHART VERSION APP VERSION DESCRIPTION +rancher-stable/rancher 18.10.11 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... +``` + For additional chart details, view the [source of these Rancher server charts](https://github.com/rancher/server-chart). ### Install cert-manager 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 b227cc657c7..aeadfed6fe7 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 @@ -24,6 +24,21 @@ The following instructions will guide you through upgrading a high-availability [Install or update](https://docs.helm.sh/using_helm/#installing-helm) Helm to the latest version. +## Chart Versioning Notes + +Up until the initial helm chart release for v2.1.0, the helm chart version matched the Rancher version (i.e `appVersion`). + +Since there are times where the helm chart will require changes without any changes to the Rancher version, we have moved to a `yy.mm.dd` helm chart version. + +Run `helm search rancher` to view which Rancher version will be launched for the specific helm chart version. + +``` +NAME CHART VERSION APP VERSION DESCRIPTION +rancher-stable/rancher 18.10.11 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... +``` + +For additional chart details, view the [source of these Rancher server charts](https://github.com/rancher/server-chart). + ## 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 80800ba870f..a268c994fd3 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,6 +38,21 @@ The following instructions will guide you through upgrading a high-availability helm init --upgrade --service-account tiller ``` +## Chart Versioning Notes + +Up until the initial helm chart release for v2.1.0, the helm chart version matched the Rancher version (i.e `appVersion`). + +Since there are times where the helm chart will require changes without any changes to the Rancher version, we have moved to a `yy.mm.dd` helm chart version. + +Run `helm search rancher` to view which Rancher version will be launched for the specific helm chart version. + +``` +NAME CHART VERSION APP VERSION DESCRIPTION +rancher-stable/rancher 18.10.11 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... +``` + +For additional chart details, view the [source of these Rancher server charts](https://github.com/rancher/server-chart). + ## 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) From 96028c7dd1f3572eb5b0e675c78cc94bc9904114 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Thu, 11 Oct 2018 14:03:35 -0700 Subject: [PATCH 6/6] version fixes --- .../v2.x/en/installation/ha/helm-rancher/_index.md | 8 +++----- .../upgrades/ha-server-upgrade-helm-airgap/_index.md | 6 ++---- .../en/upgrades/upgrades/ha-server-upgrade-helm/_index.md | 6 ++---- 3 files changed, 7 insertions(+), 13 deletions(-) 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 2333ba6483d..985bec58f97 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 @@ -19,22 +19,20 @@ helm repo add rancher-stable https://releases.rancher.com/server-charts/stable Up until the initial helm chart release for v2.1.0, the helm chart version matched the Rancher version (i.e `appVersion`). -Since there are times where the helm chart will require changes without any changes to the Rancher version, we have moved to a `yy.mm.dd` helm chart version. +Since there are times where the helm chart will require changes without any changes to the Rancher version, we have moved to a `yyyy.mm.` helm chart version. Run `helm search rancher` to view which Rancher version will be launched for the specific helm chart version. ``` NAME CHART VERSION APP VERSION DESCRIPTION -rancher-stable/rancher 18.10.11 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... +rancher-stable/rancher 2018.10.1 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... ``` -For additional chart details, view the [source of these Rancher server charts](https://github.com/rancher/server-chart). - ### Install cert-manager > **Note:** cert-manager is only required for Rancher generated and LetsEncrypt issued certificates. You may skip this step if you are bringing your own certificates and using the `ingress.tls.source=secret` option. -Rancher relies on [cert-manager](https://github.com/kubernetes/charts/tree/master/stable/cert-manager) from the [Kubernetes Helm stable catalog](https://github.com/helm/charts/tree/master/stable/cert-manager) to issue self-signed or LetsEncrypt certificates. +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 the Helm stable catalog. 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 aeadfed6fe7..5095a92343c 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,17 +28,15 @@ The following instructions will guide you through upgrading a high-availability Up until the initial helm chart release for v2.1.0, the helm chart version matched the Rancher version (i.e `appVersion`). -Since there are times where the helm chart will require changes without any changes to the Rancher version, we have moved to a `yy.mm.dd` helm chart version. +Since there are times where the helm chart will require changes without any changes to the Rancher version, we have moved to a `yyyy.mm.` helm chart version. Run `helm search rancher` to view which Rancher version will be launched for the specific helm chart version. ``` NAME CHART VERSION APP VERSION DESCRIPTION -rancher-stable/rancher 18.10.11 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... +rancher-stable/rancher 2018.10.1 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... ``` -For additional chart details, view the [source of these Rancher server charts](https://github.com/rancher/server-chart). - ## 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 a268c994fd3..a9fcaf3eb97 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 @@ -42,17 +42,15 @@ The following instructions will guide you through upgrading a high-availability Up until the initial helm chart release for v2.1.0, the helm chart version matched the Rancher version (i.e `appVersion`). -Since there are times where the helm chart will require changes without any changes to the Rancher version, we have moved to a `yy.mm.dd` helm chart version. +Since there are times where the helm chart will require changes without any changes to the Rancher version, we have moved to a `yyyy.mm.` helm chart version. Run `helm search rancher` to view which Rancher version will be launched for the specific helm chart version. ``` NAME CHART VERSION APP VERSION DESCRIPTION -rancher-stable/rancher 18.10.11 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... +rancher-stable/rancher 2018.10.1 v2.1.0 Install Rancher Server to manage Kubernetes clusters acro... ``` -For additional chart details, view the [source of these Rancher server charts](https://github.com/rancher/server-chart). - ## 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)