From ef0613fcf04fec7a6a43f06a4628f36277428d42 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Tue, 18 Jan 2022 17:34:12 +0000 Subject: [PATCH 01/12] Added new way to deploy Rancher in AWS with listing --- .../deployment/amazon-aws-qs/_index.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs/_index.md index faa98f548a5..6b08a4e531a 100644 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs/_index.md +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs/_index.md @@ -53,16 +53,20 @@ Suggestions include: 8. Paste the `rancher_server_url` from the output above into the browser. Log in when prompted (default username is `admin`, use the password set in `rancher_server_admin_password`). 9. ssh to the Rancher Server using the `id_rsa` key generated in `quickstart/aws`. -#### Result +##### Result Two Kubernetes clusters are deployed into your AWS account, one running Rancher Server and the other ready for experimentation deployments. Please note that while this setup is a great way to explore Rancher functionality, a production setup should follow our high availability setup guidelines. SSH keys for the VMs are auto-generated and stored in the module directory. -### What's Next? - -Use Rancher to create a deployment. For more information, see [Creating Deployments]({{}}/rancher/v2.6/en/quick-start-guide/workload). - ## Destroying the Environment 1. From the `quickstart/aws` folder, execute `terraform destroy --auto-approve`. 2. Wait for confirmation that all resources have been destroyed. + +# Deploying Rancher using AWS Marketplace + +There is now an additional way for you to deploy the Rancher server in AWS by using Amazon EKS. To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-2yzbnvagmi4as). + +# What's Next? + +Use Rancher to create a deployment. For more information, see [Creating Deployments]({{}}/rancher/v2.6/en/quick-start-guide/workload). From 36af60d3fafe271024e012229cac6d21070be954 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 16:54:40 +0000 Subject: [PATCH 02/12] Added AWS alternative to TOC --- .../rancher/v2.6/en/quick-start-guide/deployment/_index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/_index.md index b3169225fe4..c7163b666c5 100644 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/_index.md +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/_index.md @@ -5,12 +5,14 @@ weight: 100 Use one of the following guides to deploy and provision Rancher and a Kubernetes cluster in the provider of your choice. -- [DigitalOcean](./digital-ocean-qs) (uses Terraform) - [AWS](./amazon-aws-qs) (uses Terraform) +- [AWS Alternative](./amazon-aws-qs-alternative) (uses Amazon EKS) - [Azure](./microsoft-azure-qs) (uses Terraform) +- [DigitalOcean](./digital-ocean-qs) (uses Terraform) - [GCP](./google-gcp-qs) (uses Terraform) - [Hetzner Cloud](./hetzner-cloud-qs) (uses Terraform) - [Vagrant](./quickstart-vagrant) +- [Equinix Metal](./equinix-metal-qs) If you prefer, the following guide will take you through the same process in individual steps. Use this if you want to run Rancher in a different provider, on prem, or if you would just like to see how easy it is. From 66f3dd64a8d66c5b44418b025c320eb2733838a7 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 16:55:28 +0000 Subject: [PATCH 03/12] Removed AWS alternative from this page; adjusted headers for consistency --- .../deployment/amazon-aws-qs/_index.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs/_index.md index 6b08a4e531a..619dd062518 100644 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs/_index.md +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs/_index.md @@ -57,16 +57,12 @@ Suggestions include: Two Kubernetes clusters are deployed into your AWS account, one running Rancher Server and the other ready for experimentation deployments. Please note that while this setup is a great way to explore Rancher functionality, a production setup should follow our high availability setup guidelines. SSH keys for the VMs are auto-generated and stored in the module directory. +## What's Next? + +Use Rancher to create a deployment. For more information, see [Creating Deployments]({{}}/rancher/v2.6/en/quick-start-guide/workload). + ## Destroying the Environment 1. From the `quickstart/aws` folder, execute `terraform destroy --auto-approve`. 2. Wait for confirmation that all resources have been destroyed. - -# Deploying Rancher using AWS Marketplace - -There is now an additional way for you to deploy the Rancher server in AWS by using Amazon EKS. To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-2yzbnvagmi4as). - -# What's Next? - -Use Rancher to create a deployment. For more information, see [Creating Deployments]({{}}/rancher/v2.6/en/quick-start-guide/workload). From fde020719ed947d22c14906711df67398b25e37b Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 16:56:13 +0000 Subject: [PATCH 04/12] Updated weight for listing order --- .../en/quick-start-guide/deployment/digital-ocean-qs/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/digital-ocean-qs/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/digital-ocean-qs/_index.md index 1fa897d157f..1ecafe31489 100644 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/digital-ocean-qs/_index.md +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/digital-ocean-qs/_index.md @@ -1,7 +1,7 @@ --- title: Rancher DigitalOcean Quick Start Guide description: Read this step by step Rancher DigitalOcean guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached. -weight: 100 +weight: 120 --- The following steps will quickly deploy a Rancher server on DigitalOcean in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached. From 3bcc2d9d9948420b7a88cc4cf2b8f649ffce129c Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 17:32:36 +0000 Subject: [PATCH 05/12] Updated weight for listing order --- .../en/quick-start-guide/deployment/equinix-metal-qs/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/equinix-metal-qs/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/equinix-metal-qs/_index.md index 0daf725fdbc..3961de9af9b 100644 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/equinix-metal-qs/_index.md +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/equinix-metal-qs/_index.md @@ -1,6 +1,6 @@ --- title: Rancher Equinix Metal Quick Start -weight: 300 +weight: 250 --- ## This tutorial walks you through the following: From 1734630bc9924da5102774f158f2beaa42c622db Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 17:32:48 +0000 Subject: [PATCH 06/12] Updated weight for listing order --- .../en/quick-start-guide/deployment/google-gcp-qs/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/google-gcp-qs/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/google-gcp-qs/_index.md index 7cbd4667640..cc459c5c5ad 100644 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/google-gcp-qs/_index.md +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/google-gcp-qs/_index.md @@ -1,7 +1,7 @@ --- title: Rancher GCP Quick Start Guide description: Read this step by step Rancher GCP guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached. -weight: 100 +weight: 130 --- The following steps will quickly deploy a Rancher server on GCP in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached. From bf1172a600d526bda2cb4946910b8cf5a3d36bc3 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 17:33:03 +0000 Subject: [PATCH 07/12] Updated weight for listing order --- .../en/quick-start-guide/deployment/hetzner-cloud-qs/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/hetzner-cloud-qs/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/hetzner-cloud-qs/_index.md index 1e37d2d23f2..1d388888722 100644 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/hetzner-cloud-qs/_index.md +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/hetzner-cloud-qs/_index.md @@ -1,7 +1,7 @@ --- title: Rancher Hetzner Cloud Quick Start Guide description: Read this step by step Rancher Hetzner Cloud guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached. -weight: 100 +weight: 140 --- The following steps will quickly deploy a Rancher server on Hetzner Cloud in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached. From bd95776b2ea94e3d2c4d2b48fc1c3403c2452c4b Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 17:33:15 +0000 Subject: [PATCH 08/12] Updated weight for listing order --- .../quick-start-guide/deployment/microsoft-azure-qs/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/microsoft-azure-qs/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/microsoft-azure-qs/_index.md index a0033fe5ca5..f774350cbad 100644 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/microsoft-azure-qs/_index.md +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/microsoft-azure-qs/_index.md @@ -1,7 +1,7 @@ --- title: Rancher Azure Quick Start Guide description: Read this step by step Rancher Azure guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached. -weight: 100 +weight: 115 --- The following steps will quickly deploy a Rancher server on Azure in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached. From 5311c40876577cdf2ae596f85b8965db70cf7c55 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 17:33:51 +0000 Subject: [PATCH 09/12] Added new page/section for AWS QS using EKS --- .../deployment/amazon-aws-qs-alternative/_index.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs-alternative/_index.md diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs-alternative/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs-alternative/_index.md new file mode 100644 index 00000000000..93e04fb4a8a --- /dev/null +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs-alternative/_index.md @@ -0,0 +1,7 @@ +--- +title: Rancher AWS Quick Start Alternative +description: Use Amazon EKS to deploy Rancher server. +weight: 110 +--- + +There is now an alternative way for you to deploy the Rancher server in AWS by using Amazon EKS. To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-2yzbnvagmi4as). \ No newline at end of file From cc8e7782a4be519ddb645a8aec98b44489b54a03 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 20:11:44 +0000 Subject: [PATCH 10/12] Updated name to AWS Marketplace QS --- content/rancher/v2.6/en/quick-start-guide/deployment/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/_index.md index c7163b666c5..fa4236b3a6f 100644 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/_index.md +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/_index.md @@ -6,7 +6,7 @@ weight: 100 Use one of the following guides to deploy and provision Rancher and a Kubernetes cluster in the provider of your choice. - [AWS](./amazon-aws-qs) (uses Terraform) -- [AWS Alternative](./amazon-aws-qs-alternative) (uses Amazon EKS) +- [AWS Marketplace](./amazon-aws-marketplace-qs) (uses Amazon EKS) - [Azure](./microsoft-azure-qs) (uses Terraform) - [DigitalOcean](./digital-ocean-qs) (uses Terraform) - [GCP](./google-gcp-qs) (uses Terraform) From 544a0f37dfe046b28a15612a8550cc35b506917f Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 20:12:43 +0000 Subject: [PATCH 11/12] Updated name to AWS Marketplace QS --- .../deployment/amazon-aws-marketplace-qs/_index.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-marketplace-qs/_index.md diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-marketplace-qs/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-marketplace-qs/_index.md new file mode 100644 index 00000000000..bac47239b49 --- /dev/null +++ b/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-marketplace-qs/_index.md @@ -0,0 +1,7 @@ +--- +title: Rancher AWS Marketplace Quick Start +description: Use Amazon EKS to deploy Rancher server. +weight: 110 +--- + +There is now an additional way for you to deploy the Rancher server in AWS by using Amazon EKS. To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-2yzbnvagmi4as). \ No newline at end of file From 01149e9fadd32b086e0d8d7cae4b2eb419574289 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 31 Jan 2022 20:13:17 +0000 Subject: [PATCH 12/12] Renamed folder to Marketplace --- .../deployment/amazon-aws-qs-alternative/_index.md | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs-alternative/_index.md diff --git a/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs-alternative/_index.md b/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs-alternative/_index.md deleted file mode 100644 index 93e04fb4a8a..00000000000 --- a/content/rancher/v2.6/en/quick-start-guide/deployment/amazon-aws-qs-alternative/_index.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Rancher AWS Quick Start Alternative -description: Use Amazon EKS to deploy Rancher server. -weight: 110 ---- - -There is now an alternative way for you to deploy the Rancher server in AWS by using Amazon EKS. To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-2yzbnvagmi4as). \ No newline at end of file