From befd783ff514b742ec7f7ad397a3ef4614346962 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 31 May 2018 18:28:54 -0700 Subject: [PATCH] made changes per Denise's feedback. --- .../ha-server-install-external-lb/_index.md | 19 ++++++----------- .../installation/ha-server-install/_index.md | 10 ++++----- .../single-node-install/_index.md | 21 ++++++++++++------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha-server-install-external-lb/_index.md b/content/rancher/v2.x/en/installation/ha-server-install-external-lb/_index.md index 8840777e3ea..b2cade1a133 100644 --- a/content/rancher/v2.x/en/installation/ha-server-install-external-lb/_index.md +++ b/content/rancher/v2.x/en/installation/ha-server-install-external-lb/_index.md @@ -2,7 +2,7 @@ title: High Availability Installation with External Load Balancer weight: 276 --- -This set of instructions creates a new Kubernetes cluster that's dedicated to running Rancher in a high-availability (HA) configuration. This procedure walks you through setup of a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on: +This set of instructions creates a new Kubernetes cluster that's dedicated to running Rancher in a high-availability (HA) configuration. This procedure walks you through setting up a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on: - Layer 7 Loadbalancer with SSL termination (HTTPS) - NGINX Ingress controller (HTTP) @@ -27,11 +27,11 @@ Installation of Rancher in a high-availability configuration involves multiple p 4. [Download RKE](#4-download-rke) - RKE is a fast, versatile Kubernetes installer that you can use to install Kubernetes on your Linux hosts. + [RKE](https://github.com/rancher/rke/releases) is a fast, versatile Kubernetes installer that you can use to install Kubernetes on your Linux hosts. 5. [Download RKE Config File Template](#5-download-config-file-template) - RKE uses a `.yml` config file to install and configure your Kubernetes cluster. Download one of our RKE config file templates to get started. + RKE uses a YAML config file to install and configure your Kubernetes cluster. Download one of our RKE config file templates to get started. 6. [Configure Nodes](#6-configure-nodes) @@ -47,7 +47,7 @@ Installation of Rancher in a high-availability configuration involves multiple p 9. [Backup Your RKE Config File](#9-backup-your-rke-config-file) - After you've completed configuration of the RKE config file: 1. it's no longer a template, since you'll be using it, and 2. you should backup the RKE config file to a safe place. You can reuse this file for upgrades later. + After you've completed configuration of the RKE config file: 1. it's no longer a template since you'll be using it, and 2. you should back up the RKE config file to a safe place. You will reuse this file for upgrades later. 10. [Run RKE](#10-run-rke) @@ -103,7 +103,7 @@ We have example configurations for the following load balancers: ## 3. Configure DNS -Choose a fully qualified domain name (FQDN) that you want to use access Rancher (something like `rancher.yourdomain.com`).

+Choose a fully qualified domain name (FQDN) that you want to use to access Rancher (e.g., `rancher.yourdomain.com`).

1. Log into your DNS server a create a `DNS A` record that points to the IP address of your [load balancer](#2-configure-load-balancer). @@ -163,7 +163,7 @@ RKE is a fast, versatile Kubernetes installer that you can use to install Kubern ## 5. Download RKE Config File Template -RKE uses a `.yml` config file to install and configure your Kubernetes cluster. There are 2 templates to choose from, depending on the SSL certificate you want to use. +RKE uses a YAML config file to install and configure your Kubernetes cluster. There are 2 templates to choose from, depending on the SSL certificate you want to use. 1. Download one of following templates, depending on the SSL certificate you're using. @@ -334,12 +334,6 @@ By default, Rancher automatically generates self-signed certificates for itself ## What's Next? -<<<<<<< HEAD -- Log in to Rancher to make sure it deployed successfully. Open a web browser and navigate to the FQDN chosen in [Configure DNS](#part-3-configure-dns). -- Configure RKE to take snapshots of etcd that you can use as a backup in a disaster scenario. For more information, see [etcd recurring snapshots]({{< baseurl >}}/rancher/v2.x/en/installation/after-installation/etcd-backup-and-restoration/#etcd-recurring-snapshots). - -## SSL FAQ / Troubleshooting -======= You have a couple of options: - Create a backup of your Rancher Server in case of a disaster scenario: [High Availablility Backup and Restoration]({{< baseurl >}}/rancher/v2.x/en/installation/backups-and-restoration/ha-backup-and-restoration). @@ -348,6 +342,5 @@ You have a couple of options:
## FAQ and Troubleshooting ->>>>>>> major edits to ha install topic {{< ssl_faq >}} diff --git a/content/rancher/v2.x/en/installation/ha-server-install/_index.md b/content/rancher/v2.x/en/installation/ha-server-install/_index.md index 8ec595b8228..e141829212b 100644 --- a/content/rancher/v2.x/en/installation/ha-server-install/_index.md +++ b/content/rancher/v2.x/en/installation/ha-server-install/_index.md @@ -4,7 +4,7 @@ weight: 275 aliases: - /rancher/v2.x/en/installation/after-installation/etcd-backup-and-restoration/ --- -This set of instructions creates a new Kubernetes cluster that's dedicated to running Rancher in a high-availability (HA) configuration. This procedure walks you through setup of a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on: +This set of instructions creates a new Kubernetes cluster that's dedicated to running Rancher in a high-availability (HA) configuration. This procedure walks you through setting up a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on: - Layer 4 load balancer (TCP) - Nginx ingress controller with SSL termination (HTTPS) @@ -29,11 +29,11 @@ Installation of Rancher in a high-availability configuration involves multiple p 4. [Download RKE](#4-download-rke) - RKE is a fast, versatile Kubernetes installer that you can use to install Kubernetes on your Linux hosts. + [RKE](https://github.com/rancher/rke/releases) is a fast, versatile Kubernetes installer that you can use to install Kubernetes on your Linux hosts. 5. [Download RKE Config File Template](#5-download-config-file-template) - RKE uses a `.yml` config file to install and configure your Kubernetes cluster. Download one of our RKE config file templates to get started. + RKE uses a YAML config file to install and configure your Kubernetes cluster. Download one of our RKE config file templates to get started. 6. [Configure Nodes](#6-configure-nodes) @@ -49,7 +49,7 @@ Installation of Rancher in a high-availability configuration involves multiple p 9. [Backup Your RKE Config File](#9-backup-your-yaml-file) - After you've completed configuration of the RKE config file: 1. it's no longer a template, since you'll be using it, and 2. you should backup the RKE config file to a safe place. You can reuse this file for upgrades later. + After you've completed configuration of the RKE config file: 1. it's no longer a template since you'll be using it, and 2. you should back up the RKE config file to a safe place. You will reuse this file for upgrades later. 10. [Run RKE](#10-run-rke) @@ -154,7 +154,7 @@ docker run -d --restart=unless-stopped \ ## 3. Configure DNS -Choose a fully qualified domain name (FQDN) that you want to use access Rancher (something like `rancher.yourdomain.com`).

+Choose a fully qualified domain name (FQDN) that you want to use to access Rancher (e.g., `rancher.yourdomain.com`).

1. Log into your DNS server a create a `DNS A` record that points to the IP address of your [load balancer](#2-configure-load-balancer). diff --git a/content/rancher/v2.x/en/installation/single-node-install/_index.md b/content/rancher/v2.x/en/installation/single-node-install/_index.md index db09ad462c4..c7975444fed 100644 --- a/content/rancher/v2.x/en/installation/single-node-install/_index.md +++ b/content/rancher/v2.x/en/installation/single-node-install/_index.md @@ -6,7 +6,7 @@ For development environments, we recommend installing Rancher by running a singl >**Want to use an external load balancer?** -> See [Single Node Installation with an External Loadbalancer]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install-external-lb) instead. +> See [Single Node Installation with an External Load Balancer]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install-external-lb) instead. @@ -54,10 +54,17 @@ For security purposes, SSL (Secure Sockets Layer) is required when using Rancher Choose from the following options: -- [Option A—Default Self-Signed Certificate](#option-a-default-self-signed-certificate) -- [Option B—Bring Your Own Certificate: Self-Signed](#option-b-bring-your-own-certificate-self-signed) -- [Option C—Bring Your Own Certificate: Signed by Recognized CA](#option-c-bring-your-own-certificate-signed-by-recognized-ca) -- [Option D—Let's Encrypt Certificates](#option-d-let-s-encrypt-certificate) +- [Installation Outline](#installation-outline) +- [1. Provision Linux Host](#1-provision-linux-host) + - [Requirements](#requirements) +- [2. Choose an SSL Option and Install Rancher](#2-choose-an-ssl-option-and-install-rancher) + - [Option A—Default Self-Signed Certificate](#option-adefault-self-signed-certificate) + - [Option B—Bring Your Own Certificate: Self-Signed](#option-bbring-your-own-certificate--self-signed) + - [Option C—Bring Your Own Certificate: Signed by Recognized CA](#option-cbring-your-own-certificate--signed-by-recognized-ca) + - [Option D-Let's Encrypt Certificate](#option-d-lets-encrypt-certificate) +- [What's Next?](#whats-next) +- [FAQ and Troubleshooting](#faq-and-troubleshooting) +- [Persistent Data](#persistent-data) ### Option A—Default Self-Signed Certificate @@ -105,7 +112,7 @@ Your Rancher install can use a self-signed certificate that you provide to encry ### Option C—Bring Your Own Certificate: Signed by Recognized CA -If you're publishing your app publically, you should ideally be using a certificate signed by a recognized CA. +If you're publishing your app publicly, you should ideally be using a certificate signed by a recognized CA. >**Prerequisites:** > @@ -166,7 +173,7 @@ Run the following commands from your Linux host. You have a couple of options: - Create a backup of your Rancher Server in case of a disaster scenario: [Single Node Backup and Restoration]({{< baseurl >}}/rancher/v2.x/en/installation/backups-and-restoration/single-node-backup-and-restoration/). -- Create a Kubernettes cluster: [Creating a Cluster]({{ }}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/). +- Create a Kubernetes cluster: [Creating a Cluster]({{ }}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/).