From 1e383b168fba2d2f9239164cb9a12a7c152fd876 Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Tue, 6 Oct 2020 09:58:23 -0700 Subject: [PATCH] Link to K3s and RKE resources in installation docs --- .../en/installation/tutorials/_index.md | 5 ----- .../install-rancher-on-k8s/_index.md | 19 +++++++++++++------ .../advanced/arm64-platform/_index.md | 6 +----- .../ha-with-external-db/_index.md | 0 .../infra-for-ha-with-external-db/_index.md | 0 .../infra-for-ha/_index.md | 0 .../infrastructure-tutorials/nlb/_index.md | 4 ---- 7 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 content/k3s/latest/en/installation/tutorials/_index.md rename content/{k3s/latest/en/installation/tutorials => rancher/v2.x/en/installation/resources/k8s-tutorials}/ha-with-external-db/_index.md (100%) rename content/{k3s/latest/en/installation/tutorials => rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials}/infra-for-ha-with-external-db/_index.md (100%) rename content/{rke/latest/en/tutorials => rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials}/infra-for-ha/_index.md (100%) diff --git a/content/k3s/latest/en/installation/tutorials/_index.md b/content/k3s/latest/en/installation/tutorials/_index.md deleted file mode 100644 index 40de388bc75..00000000000 --- a/content/k3s/latest/en/installation/tutorials/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Tutorials -weight: 10000 ---- - 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 8b91d316700..c4a17181a24 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 @@ -10,12 +10,19 @@ aliases: - /rancher/v2.x/en/installation/install-rancher-on-k8s/install --- -> **Prerequisite:** -> Set up the Rancher server's local Kubernetes cluster. -> -> - 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. -> - 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. +# Prerequisite + +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. +- **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. + +For the tutorial to install an RKE Kubernetes cluster, refer to [this page.]({{}}/rancher/v2.x/en/installation/resources/k8s-tutorials/ha-rke/) For help setting up the infrastructure for a high-availability RKE cluster, refer to [this page.]({{}}/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/infra-for-ha) + +For the tutorial to install a K3s Kubernetes cluster, refer to [this page.]({{}}/rancher/v2.x/en/installation/resources/k8s-tutorials/ha-with-external-db) For help setting up the infrastructure for a high-availability K3s cluster, refer to [this page.]({{}}/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/infra-for-ha-with-external-db) # Install the Rancher Helm Chart diff --git a/content/rancher/v2.x/en/installation/resources/advanced/arm64-platform/_index.md b/content/rancher/v2.x/en/installation/resources/advanced/arm64-platform/_index.md index b147141d8fa..60f93f657b4 100644 --- a/content/rancher/v2.x/en/installation/resources/advanced/arm64-platform/_index.md +++ b/content/rancher/v2.x/en/installation/resources/advanced/arm64-platform/_index.md @@ -1,12 +1,8 @@ --- -title: Running on ARM64 (Experimental) +title: "Running on ARM64 (Experimental)" weight: 3 aliases: -<<<<<<< HEAD - /rancher/v2.x/en/installation/options/arm64-platform -======= - - /rancher/v2.x/en/installation/options/arm64-platform/ ->>>>>>> Fix installation doc errors --- > **Important:** diff --git a/content/k3s/latest/en/installation/tutorials/ha-with-external-db/_index.md b/content/rancher/v2.x/en/installation/resources/k8s-tutorials/ha-with-external-db/_index.md similarity index 100% rename from content/k3s/latest/en/installation/tutorials/ha-with-external-db/_index.md rename to content/rancher/v2.x/en/installation/resources/k8s-tutorials/ha-with-external-db/_index.md diff --git a/content/k3s/latest/en/installation/tutorials/infra-for-ha-with-external-db/_index.md b/content/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/infra-for-ha-with-external-db/_index.md similarity index 100% rename from content/k3s/latest/en/installation/tutorials/infra-for-ha-with-external-db/_index.md rename to content/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/infra-for-ha-with-external-db/_index.md diff --git a/content/rke/latest/en/tutorials/infra-for-ha/_index.md b/content/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/infra-for-ha/_index.md similarity index 100% rename from content/rke/latest/en/tutorials/infra-for-ha/_index.md rename to content/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/infra-for-ha/_index.md diff --git a/content/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/nlb/_index.md b/content/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/nlb/_index.md index d76431c8c90..39e4ca0fb03 100644 --- a/content/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/nlb/_index.md +++ b/content/rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/nlb/_index.md @@ -4,11 +4,7 @@ weight: 5 aliases: - /rancher/v2.x/en/installation/ha/create-nodes-lb/nlb - /rancher/v2.x/en/installation/k8s-install/create-nodes-lb/nlb -<<<<<<< HEAD - /rancher/v2.x/en/installation/options/nlb -======= - - /rancher/v2.x/en/installation/options/nlb/ ->>>>>>> Fix installation doc errors --- This how-to guide describes how to set up a Network Load Balancer (NLB) in Amazon's EC2 service that will direct traffic to multiple instances on EC2.