diff --git a/content/rancher/v2.x/en/catalog/globaldns/_index.md b/content/rancher/v2.x/en/catalog/globaldns/_index.md index 906ea2f23f7..ffa841ae509 100644 --- a/content/rancher/v2.x/en/catalog/globaldns/_index.md +++ b/content/rancher/v2.x/en/catalog/globaldns/_index.md @@ -7,7 +7,7 @@ _Available as of v2.2.0_ Rancher's Global DNS feature provides a way to program an external DNS provider to route traffic to your Kubernetes applications. Since the DNS programming supports spanning applications across different Kubernetes clusters, Global DNS is configured at a global level. An application can become highly available as it allows you to have one application run on different Kubernetes clusters. If one of your Kubernetes clusters goes down, the application would still be accessible. -> **Note:** Global DNS is only available in [Kubernetes installations]({{}}/rancher/v2.x/en/installation/k8s-install/) with the [`local` cluster enabled]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#import-local-cluster). +> **Note:** Global DNS is only available in [Kubernetes installations]({{}}/rancher/v2.x/en/installation/k8s-install/) with the [`local` cluster enabled]({{}}/rancher/v2.x/en/installation/options/chart-options/#import-local-cluster). ## Global DNS Providers @@ -63,7 +63,7 @@ By default, only [global administrators]({{< baseurl >}}/rancher/v2.x/en/admin-s >**Notes:** > ->- Alibaba Cloud SDK uses TZ data. It needs to be present on `/usr/share/zoneinfo` path of the nodes running [`local` cluster]({{< baseurl >}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#import-local-cluster), and it is mounted to the external DNS pods. If it is not available on the nodes, please follow the [instruction](https://www.ietf.org/timezones/tzdb-2018f/tz-link.html) to prepare it. +>- Alibaba Cloud SDK uses TZ data. It needs to be present on `/usr/share/zoneinfo` path of the nodes running [`local` cluster]({{< baseurl >}}/rancher/v2.x/en/installation/options/chart-options/#import-local-cluster), and it is mounted to the external DNS pods. If it is not available on the nodes, please follow the [instruction](https://www.ietf.org/timezones/tzdb-2018f/tz-link.html) to prepare it. >- Different versions of AliDNS have different allowable TTL range, where the default TTL for a global DNS entry may not be valid. Please see the [reference](https://www.alibabacloud.com/help/doc-detail/34338.htm) before adding an AliDNS entry. {{% /accordion %}} diff --git a/content/rancher/v2.x/en/installation/_index.md b/content/rancher/v2.x/en/installation/_index.md index c68003879a0..234d9457590 100644 --- a/content/rancher/v2.x/en/installation/_index.md +++ b/content/rancher/v2.x/en/installation/_index.md @@ -51,11 +51,11 @@ For more architecture recommendations, refer to [this page.]({{}}/ranch ### More Options for Installations on a Kubernetes Cluster -Refer to the [Helm chart options]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/) for details on installing Rancher on a Kubernetes cluster with other configurations, including: +Refer to the [Helm chart options]({{}}/rancher/v2.x/en/installation/options/chart-options/) for details on installing Rancher on a Kubernetes cluster with other configurations, including: -- With [API auditing to record all transactions]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#api-audit-log) -- With [TLS termination on a load balancer]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#external-tls-termination) -- With a [custom Ingress]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#customizing-your-ingress) +- With [API auditing to record all transactions]({{}}/rancher/v2.x/en/installation/options/chart-options/#api-audit-log) +- With [TLS termination on a load balancer]({{}}/rancher/v2.x/en/installation/options/chart-options/#external-tls-termination) +- With a [custom Ingress]({{}}/rancher/v2.x/en/installation/options/chart-options/#customizing-your-ingress) In the Rancher installation instructions, we recommend using RKE (Rancher Kubernetes Engine) to set up a Kubernetes cluster before installing Rancher on the cluster. RKE has many configuration options for customizing the Kubernetes cluster to suit your specific environment. Please see the [RKE Documentation]({{}}/rke/latest/en/config-options/) for the full list of options and capabilities. diff --git a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md index b63fb3c8d0d..62e23584af3 100644 --- a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md @@ -58,7 +58,7 @@ There are three recommended options for the source of the certificate. Rancher relies on [cert-manager](https://github.com/jetstack/cert-manager) to issue certificates from Rancher's own generated CA or to request Let's Encrypt certificates. -`cert-manager` is only required for certificates issued by Rancher's generated CA (`ingress.tls.source=rancher`) and Let's Encrypt issued certificates (`ingress.tls.source=letsEncrypt`). You should skip this step if you are using your own certificate files (option `ingress.tls.source=secret`) or if you use [TLS termination on an External Load Balancer]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#external-tls-termination). +`cert-manager` is only required for certificates issued by Rancher's generated CA (`ingress.tls.source=rancher`) and Let's Encrypt issued certificates (`ingress.tls.source=letsEncrypt`). You should skip this step if you are using your own certificate files (option `ingress.tls.source=secret`) or if you use [TLS termination on an External Load Balancer]({{}}/rancher/v2.x/en/installation/options/chart-options/#external-tls-termination). {{% accordion id="cert-manager" label="Click to Expand" %}} @@ -197,11 +197,11 @@ It should show the same count for `DESIRED` and `AVAILABLE`. The Rancher chart configuration has many options for customizing the install to suit your specific environment. Here are some common advanced scenarios. -- [HTTP Proxy]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#http-proxy) -- [Private Docker Image Registry]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#private-registry-and-air-gap-installs) -- [TLS Termination on an External Load Balancer]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#external-tls-termination) +- [HTTP Proxy]({{}}/rancher/v2.x/en/installation/options/chart-options/#http-proxy) +- [Private Docker Image Registry]({{}}/rancher/v2.x/en/installation/options/chart-options/#private-registry-and-air-gap-installs) +- [TLS Termination on an External Load Balancer]({{}}/rancher/v2.x/en/installation/options/chart-options/#external-tls-termination) -See the [Chart Options]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/) for the full list of options. +See the [Chart Options]({{}}/rancher/v2.x/en/installation/options/chart-options/) for the full list of options. ### Save your options diff --git a/content/rancher/v2.x/en/installation/options/api-audit-log/_index.md b/content/rancher/v2.x/en/installation/options/api-audit-log/_index.md index 04850e1e6f6..c883b60deae 100644 --- a/content/rancher/v2.x/en/installation/options/api-audit-log/_index.md +++ b/content/rancher/v2.x/en/installation/options/api-audit-log/_index.md @@ -17,7 +17,7 @@ The Audit Log is enabled and configured by passing environment variables to the - [Docker Install]({{}}/rancher/v2.x/en/installation/other-installation-methods/single-node-docker/#api-audit-log) -- [Kubernetes Install]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#api-audit-log) +- [Kubernetes Install]({{}}/rancher/v2.x/en/installation/options/chart-options/#api-audit-log) ## API Audit Log Options diff --git a/content/rancher/v2.x/en/installation/options/custom-ca-root-certificate/_index.md b/content/rancher/v2.x/en/installation/options/custom-ca-root-certificate/_index.md index df97427d781..87a19447091 100644 --- a/content/rancher/v2.x/en/installation/options/custom-ca-root-certificate/_index.md +++ b/content/rancher/v2.x/en/installation/options/custom-ca-root-certificate/_index.md @@ -24,4 +24,5 @@ For details on starting a Rancher container with your private CA certificates mo - [Docker Install]({{}}/rancher/v2.x/en/installation/other-installation-methods/single-node-docker/#custom-ca-certificate) -- [Kubernetes Install]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#additional-trusted-cas) +- [Kubernetes Install]({{}}/rancher/v2.x/en/installation/options/chart-options/#additional-trusted-cas) + diff --git a/content/rancher/v2.x/en/installation/options/rke-add-on/layer-7-lb/nginx/_index.md b/content/rancher/v2.x/en/installation/options/rke-add-on/layer-7-lb/nginx/_index.md index 022ef8b751b..c2b9f8fe1ad 100644 --- a/content/rancher/v2.x/en/installation/options/rke-add-on/layer-7-lb/nginx/_index.md +++ b/content/rancher/v2.x/en/installation/options/rke-add-on/layer-7-lb/nginx/_index.md @@ -20,7 +20,7 @@ For help installing NGINX, refer to their [install documentation](https://www.ng ## Create NGINX Configuration -See [Example NGINX config]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#example-nginx-config). +See [Example NGINX config]({{}}/rancher/v2.x/en/installation/options/chart-options/#example-nginx-config). ## Run NGINX diff --git a/content/rancher/v2.x/en/installation/options/tls-settings/_index.md b/content/rancher/v2.x/en/installation/options/tls-settings/_index.md index 669b791bc6e..7cf0fa0c2a9 100644 --- a/content/rancher/v2.x/en/installation/options/tls-settings/_index.md +++ b/content/rancher/v2.x/en/installation/options/tls-settings/_index.md @@ -15,7 +15,7 @@ The Audit Log is enabled and configured by passing environment variables to the - [Installing Rancher on a single node with Docker]({{}}/rancher/v2.x/en/installation/other-installation-methods/single-node-docker/#tls-settings) -- [Installing Rancher on Kubernetes]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#tls-settings) +- [Installing Rancher on Kubernetes]({{}}/rancher/v2.x/en/installation/options/chart-options/#tls-settings) ## TLS settings diff --git a/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/install-rancher/_index.md b/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/install-rancher/_index.md index 69110234221..f0f90e6eaea 100644 --- a/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/install-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/install-rancher/_index.md @@ -55,7 +55,7 @@ Rancher Server is designed to be secure by default and requires SSL/TLS configur When Rancher is installed on an air gapped Kubernetes cluster, there are two recommended options for the source of the certificate. -> **Note:** If you want terminate SSL/TLS externally, see [TLS termination on an External Load Balancer]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#external-tls-termination). +> **Note:** If you want terminate SSL/TLS externally, see [TLS termination on an External Load Balancer]({{}}/rancher/v2.x/en/installation/options/chart-options/#external-tls-termination). | Configuration | Chart option | Description | Requires cert-manager | | ------------------------------------------ | ---------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | @@ -206,7 +206,7 @@ If you are installing Rancher versions prior to v2.3.0, you will not be able to These resources could be helpful when installing Rancher: -- [Rancher Helm chart options]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/) +- [Rancher Helm chart options]({{}}/rancher/v2.x/en/installation/options/chart-options/) - [Adding TLS secrets]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/tls-secrets/) - [Troubleshooting Rancher Kubernetes Installations]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/troubleshooting/) diff --git a/content/rancher/v2.x/en/security/hardening-2.1/_index.md b/content/rancher/v2.x/en/security/hardening-2.1/_index.md index 5e027ab8c62..6c65b6b757c 100644 --- a/content/rancher/v2.x/en/security/hardening-2.1/_index.md +++ b/content/rancher/v2.x/en/security/hardening-2.1/_index.md @@ -870,7 +870,7 @@ Upgrade the Rancher server installation using Helm, and configure the audit log #### Reference -- +- ## 3.2 - Rancher Management Control Plane Authentication diff --git a/content/rancher/v2.x/en/security/hardening-2.2/_index.md b/content/rancher/v2.x/en/security/hardening-2.2/_index.md index 81104b9117f..1d45f862926 100644 --- a/content/rancher/v2.x/en/security/hardening-2.2/_index.md +++ b/content/rancher/v2.x/en/security/hardening-2.2/_index.md @@ -913,7 +913,7 @@ Upgrade the Rancher server installation using Helm, and configure the audit log #### Reference -- +- ## 3.2 - Rancher Management Control Plane Authentication diff --git a/content/rancher/v2.x/en/security/hardening-2.3.3/_index.md b/content/rancher/v2.x/en/security/hardening-2.3.3/_index.md index ebc2a6ae8e9..b001262a839 100644 --- a/content/rancher/v2.x/en/security/hardening-2.3.3/_index.md +++ b/content/rancher/v2.x/en/security/hardening-2.3.3/_index.md @@ -761,7 +761,7 @@ Upgrade the Rancher server installation using Helm, and configure the audit log #### Reference -- +- ## 3.2 - Rancher Management Control Plane Authentication diff --git a/content/rancher/v2.x/en/security/hardening-2.3/_index.md b/content/rancher/v2.x/en/security/hardening-2.3/_index.md index 163c948a123..30b9a6f8361 100644 --- a/content/rancher/v2.x/en/security/hardening-2.3/_index.md +++ b/content/rancher/v2.x/en/security/hardening-2.3/_index.md @@ -1023,7 +1023,7 @@ Upgrade the Rancher server installation using Helm, and configure the audit log #### Reference -- +- ## 3.2 - Rancher Management Control Plane Authentication diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha/_index.md index e727aebfac0..88072522536 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/ha/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/ha/_index.md @@ -17,7 +17,7 @@ If you installed Rancher using the RKE Add-on yaml, follow the directions to [mi > > - [Let's Encrypt will be blocking cert-manager instances older than 0.8.0 starting November 1st 2019.](https://community.letsencrypt.org/t/blocking-old-cert-manager-versions/98753) Upgrade cert-manager to the latest version by following [these instructions.]({{}}/rancher/v2.x/en/installation/options/upgrading-cert-manager) > - The upgrade instructions assume you are using Helm 3. For migration of installs started with Helm 2, refer to the official [Helm 2 to 3 migration docs.](https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/) This [section]({{}}/rancher/v2.x/en/upgrades/upgrades/ha/helm2) provides a copy of the older upgrade instructions that used Helm 2, and it is intended to be used if upgrading to Helm 3 is not feasible. -> - If you are upgrading Rancher from v2.x to v2.3+, and you are using external TLS termination, you will need to edit the cluster.yml to [enable using forwarded host headers.]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/chart-options/#configuring-ingress-for-external-tls-when-using-nginx-v0-25) +> - If you are upgrading Rancher from v2.x to v2.3+, and you are using external TLS termination, you will need to edit the cluster.yml to [enable using forwarded host headers.]({{}}/rancher/v2.x/en/installation/options/chart-options/#configuring-ingress-for-external-tls-when-using-nginx-v0-25) # Prerequisites