From 0eb034d3cfb82538dc3ec82f8e840ae0bf9c82c2 Mon Sep 17 00:00:00 2001 From: Ansil H Date: Fri, 18 Dec 2020 12:05:17 +0530 Subject: [PATCH 1/5] Added ingress controller prerequisite To address https://github.com/rancher/rancher/issues/30549 --- .../v2.x/en/installation/install-rancher-on-k8s/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md index 4e07a469d26..fa14f652ceb 100644 --- a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md +++ b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md @@ -17,6 +17,7 @@ Set up the Rancher server's local Kubernetes cluster. The cluster requirements depend on the Rancher version: - **As of Rancher v2.5,** Rancher can be installed on any Kubernetes cluster. This cluster can use upstream Kubernetes, or it can use one of Rancher's Kubernetes distributions, or it can be a managed Kubernetes cluster from a provider such as Amazon EKS. +> **Note:** For Rancher v2.5 in managed clusters,a compatibel Ingress controller should be deployed first if you are configuring [SSL termination on Rancher.]({{}}/rancher/v2.x/en/installation/install-rancher-on-k8s/#4-choose-your-ssl-configuration). - **In Rancher v2.4.x,** Rancher needs to be installed on a K3s Kubernetes cluster or an RKE Kubernetes cluster. - **In Rancher prior to v2.4,** Rancher needs to be installed on an RKE Kubernetes cluster. From 8762c4225e56d8feafcbfbd7d1482b699579046d Mon Sep 17 00:00:00 2001 From: Ansil H Date: Fri, 18 Dec 2020 12:07:43 +0530 Subject: [PATCH 2/5] Update _index.md --- .../v2.x/en/installation/install-rancher-on-k8s/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md index fa14f652ceb..9c821b410fa 100644 --- a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md +++ b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md @@ -17,7 +17,7 @@ Set up the Rancher server's local Kubernetes cluster. The cluster requirements depend on the Rancher version: - **As of Rancher v2.5,** Rancher can be installed on any Kubernetes cluster. This cluster can use upstream Kubernetes, or it can use one of Rancher's Kubernetes distributions, or it can be a managed Kubernetes cluster from a provider such as Amazon EKS. -> **Note:** For Rancher v2.5 in managed clusters,a compatibel Ingress controller should be deployed first if you are configuring [SSL termination on Rancher.]({{}}/rancher/v2.x/en/installation/install-rancher-on-k8s/#4-choose-your-ssl-configuration). +> **Note:** For Rancher v2.5 in managed clusters,a compatible Ingress controller should be deployed first if you are configuring [SSL termination on Rancher.]({{}}/rancher/v2.x/en/installation/install-rancher-on-k8s/#4-choose-your-ssl-configuration). - **In Rancher v2.4.x,** Rancher needs to be installed on a K3s Kubernetes cluster or an RKE Kubernetes cluster. - **In Rancher prior to v2.4,** Rancher needs to be installed on an RKE Kubernetes cluster. From 4202d8235ceb2c542e2672c1b698aa1d12a22fdb Mon Sep 17 00:00:00 2001 From: Ansil H Date: Fri, 18 Dec 2020 12:09:27 +0530 Subject: [PATCH 3/5] rephrased note --- .../v2.x/en/installation/install-rancher-on-k8s/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md index 9c821b410fa..0575575fb6d 100644 --- a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md +++ b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md @@ -17,7 +17,7 @@ Set up the Rancher server's local Kubernetes cluster. The cluster requirements depend on the Rancher version: - **As of Rancher v2.5,** Rancher can be installed on any Kubernetes cluster. This cluster can use upstream Kubernetes, or it can use one of Rancher's Kubernetes distributions, or it can be a managed Kubernetes cluster from a provider such as Amazon EKS. -> **Note:** For Rancher v2.5 in managed clusters,a compatible Ingress controller should be deployed first if you are configuring [SSL termination on Rancher.]({{}}/rancher/v2.x/en/installation/install-rancher-on-k8s/#4-choose-your-ssl-configuration). +> **Note:** For Rancher v2.5 in managed clusters, you should deploy a compatible Ingress controller first to configure [SSL termination on Rancher.] ({{}}/rancher/v2.x/en/installation/install-rancher-on-k8s/#4-choose-your-ssl-configuration). - **In Rancher v2.4.x,** Rancher needs to be installed on a K3s Kubernetes cluster or an RKE Kubernetes cluster. - **In Rancher prior to v2.4,** Rancher needs to be installed on an RKE Kubernetes cluster. From 41449392185271a6f3df68529ed627ca59956dea Mon Sep 17 00:00:00 2001 From: Ansil H Date: Fri, 18 Dec 2020 12:10:12 +0530 Subject: [PATCH 4/5] updated hyperlink --- .../v2.x/en/installation/install-rancher-on-k8s/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md index 0575575fb6d..4b7bce78531 100644 --- a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md +++ b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md @@ -17,7 +17,7 @@ Set up the Rancher server's local Kubernetes cluster. The cluster requirements depend on the Rancher version: - **As of Rancher v2.5,** Rancher can be installed on any Kubernetes cluster. This cluster can use upstream Kubernetes, or it can use one of Rancher's Kubernetes distributions, or it can be a managed Kubernetes cluster from a provider such as Amazon EKS. -> **Note:** For Rancher v2.5 in managed clusters, you should deploy a compatible Ingress controller first to configure [SSL termination on Rancher.] ({{}}/rancher/v2.x/en/installation/install-rancher-on-k8s/#4-choose-your-ssl-configuration). +> **Note:** For Rancher v2.5 in managed clusters, you should deploy a compatible Ingress controller first to configure [SSL termination on Rancher.]({{}}/rancher/v2.x/en/installation/install-rancher-on-k8s/#4-choose-your-ssl-configuration). - **In Rancher v2.4.x,** Rancher needs to be installed on a K3s Kubernetes cluster or an RKE Kubernetes cluster. - **In Rancher prior to v2.4,** Rancher needs to be installed on an RKE Kubernetes cluster. From 834a47803a97fe07946e5a9fc77ee90cbd3af07c Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Fri, 18 Dec 2020 14:37:40 -0700 Subject: [PATCH 5/5] Clarify when ingress needs to be deployed --- .../v2.x/en/installation/install-rancher-on-k8s/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md index 4b7bce78531..33096d9636d 100644 --- a/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md +++ b/content/rancher/v2.x/en/installation/install-rancher-on-k8s/_index.md @@ -17,7 +17,7 @@ Set up the Rancher server's local Kubernetes cluster. The cluster requirements depend on the Rancher version: - **As of Rancher v2.5,** Rancher can be installed on any Kubernetes cluster. This cluster can use upstream Kubernetes, or it can use one of Rancher's Kubernetes distributions, or it can be a managed Kubernetes cluster from a provider such as Amazon EKS. -> **Note:** For Rancher v2.5 in managed clusters, you should deploy a compatible Ingress controller first to configure [SSL termination on Rancher.]({{}}/rancher/v2.x/en/installation/install-rancher-on-k8s/#4-choose-your-ssl-configuration). +> **Note:** To deploy Rancher v2.5 on a hosted Kubernetes cluster such as EKS, GKE, or AKS, you should deploy a compatible Ingress controller first to configure [SSL termination on Rancher.]({{}}/rancher/v2.x/en/installation/install-rancher-on-k8s/#4-choose-your-ssl-configuration). - **In Rancher v2.4.x,** Rancher needs to be installed on a K3s Kubernetes cluster or an RKE Kubernetes cluster. - **In Rancher prior to v2.4,** Rancher needs to be installed on an RKE Kubernetes cluster.