From b2cf51e92081da56d2ab3a41ae7d2f8593334994 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 4 Jan 2019 18:38:11 -0700 Subject: [PATCH] corrected a few broken links and typos --- content/rancher/v2.x/en/v1.6-migration/_index.md | 8 ++++---- .../en/v1.6-migration/discover-services/_index.md | 4 ++-- .../en/v1.6-migration/expose-services/_index.md | 2 +- .../v2.x/en/v1.6-migration/get-started/_index.md | 13 ++++++++----- .../v2.x/en/v1.6-migration/kub-intro/_index.md | 8 +++++--- .../v2.x/en/v1.6-migration/load-balancing/_index.md | 2 +- .../v2.x/en/v1.6-migration/monitor-apps/_index.md | 2 +- 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/content/rancher/v2.x/en/v1.6-migration/_index.md b/content/rancher/v2.x/en/v1.6-migration/_index.md index 7712db460d0..3a8a0c463a2 100644 --- a/content/rancher/v2.x/en/v1.6-migration/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/_index.md @@ -3,7 +3,7 @@ title: Migrating from Rancher v1.6 to v2.x weight: 10000 --- -Rancher v2.x has been rearchitected and rewritten with the goal of providing a complete management solution for Kubernetes and Docker. Due to these extensive changes, there is no direct upgrade path from v1.6.x to v2.x, but rather a migration of your v1.6 services into v2.x as Kubernetes workloads. In v1.6, the most common orchestration used was Rancher's own engine called Cattle. The following guide explains and educates our Cattle users on running workloads in a Kubernetes environment. +Rancher v2.x has been rearchitected and rewritten with the goal of providing a complete management solution for Kubernetes and Docker. Due to these extensive changes, there is no direct upgrade path from v1.6 to v2.x, but rather a migration of your v1.6 services into v2.x as Kubernetes workloads. In v1.6, the most common orchestration used was Rancher's own engine called Cattle. The following guide explains and educates our Cattle users on running workloads in a Kubernetes environment. ## Video @@ -21,10 +21,10 @@ This video demonstrates a complete walk through of migration from Rancher v1.6 t >**Already a Kubernetes user in v1.6?** > > _Get Started_ is the only section you need to review for migration to v2.x. You can skip everything else. -- [2. Migrate Your Apps]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/run-migration-tool/) +- [2. Migrate Your Services]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/run-migration-tool/) - [3. Expose Your Services]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/expose-services/) -- [4. Monitor Your Apps]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/monitor-apps) -- [5. Schedule Workloads]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/schedule-workloads/) +- [4. Configure Health Checks]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/monitor-apps) +- [5. Schedule Your Services]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/schedule-workloads/) - [6. Service Discovery]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/discover-services/) - [7. Load Balancing]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/load-balancing/) diff --git a/content/rancher/v2.x/en/v1.6-migration/discover-services/_index.md b/content/rancher/v2.x/en/v1.6-migration/discover-services/_index.md index 230e90f0618..4a4a5c7e7ac 100644 --- a/content/rancher/v2.x/en/v1.6-migration/discover-services/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/discover-services/_index.md @@ -16,8 +16,8 @@ This document will also show you how to link the workloads and services that you -- [Service Discovery: Rancher v1.6 vs. v2.x](#service-discovery-rancher-v16-vs-v2x) -- [Service Discovery Within and Across Stacks](#service-discovery-within-and-across-stacks) +- [Service Discovery: Rancher v1.6 vs. v2.x](#service-discovery-rancher-v1-6-vs-v2-x) +- [Service Discovery Within and Across Namespaces](#service-discovery-within-and-across-namespaces) - [Container Discovery](#container-discovery) - [Service Name Alias Creation](#service-name-alias-creation) diff --git a/content/rancher/v2.x/en/v1.6-migration/expose-services/_index.md b/content/rancher/v2.x/en/v1.6-migration/expose-services/_index.md index c2bb0d21d5a..166606948d3 100644 --- a/content/rancher/v2.x/en/v1.6-migration/expose-services/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/expose-services/_index.md @@ -16,7 +16,7 @@ Use this document to correct workloads that list `ports` in `output.txt`. You ca -- [What's Different About Exposing Services in Rancher v2.x?](#whats-different-about-exposing-services-in-rancher-v2x) +- [What's Different About Exposing Services in Rancher v2.x?](#what-s-different-about-exposing-services-in-rancher-v2-x) - [HostPorts](#hostports) - [Setting HostPorts](#setting-hostports) - [NodePorts](#nodeports) diff --git a/content/rancher/v2.x/en/v1.6-migration/get-started/_index.md b/content/rancher/v2.x/en/v1.6-migration/get-started/_index.md index ed1a2c514ff..f6734c7eda5 100644 --- a/content/rancher/v2.x/en/v1.6-migration/get-started/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/get-started/_index.md @@ -18,9 +18,9 @@ Get started with your migration to Rancher v2.x by installing Rancher and config ## A. Install Rancher v2.x -The first step in migrating from v1.6 to v2.x is to install the Rancher v2.x Server side-by-side with your v1.6 Server, which you'll need during the migration process. Due the architecture changes between v1.6 and v2.x, there is no direct path for upgrade. You'll have to install v2.x independently and then migrate your v1.6 services to v2.x. +The first step in migrating from v1.6 to v2.x is to install the Rancher v2.x Server side-by-side with your v1.6 Server, as you'll need your old install during the migration process. Due to the architecture changes between v1.6 and v2.x, there is no direct path for upgrade. You'll have to install v2.x independently and then migrate your v1.6 services to v2.x. -New for v2.x, all communication to Rancher Server is encrypted. The procedures below instructs you on how to create and install these certificates. +New for v2.x, all communication to Rancher Server is encrypted. The procedures below instruct you not only on installation of Rancher, but also creation and installation of these certificates. Before installing v2.x, provision one host or more to function as your Rancher Server(s). You can find the requirements for these hosts in [Server Requirements]({{< baseurl >}}/rancher/v2.x/en/installation/requirements/). @@ -38,7 +38,7 @@ After provisioning your node(s), install Rancher: ## B. Configure Authentication -After Rancher Server is installed, we recommend configuring external authentication (like Active Directory or GitHub) so that users can log into Rancher using their single sign-on. For a full list of supported authentication providers and instructions on how to configure them, see [Authentication]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication). +After your Rancher v2.x Server is installed, we recommend configuring external authentication (like Active Directory or GitHub) so that users can log into Rancher using their single sign-on. For a full list of supported authentication providers and instructions on how to configure them, see [Authentication]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication).
Rancher v2.x Authentication
@@ -57,10 +57,12 @@ In Rancher v1.6, we encouraged our SAML users to use Shibboleth, as it was the o ## C. Provision a Cluster and Project -Begin work in Rancher by provisioning a new Kubernetes cluster, which is similar to an environment in v1.6. This cluster will host your application deployments. +Begin work in Rancher v2.x by using it to provision a new Kubernetes cluster, which is similar to an environment in v1.6. This cluster will host your application deployments. A cluster and project in combined together in Rancher v2.x equivalent to a v1.6 environment. A _cluster_ is the compute boundary (i.e., your hosts) and a _project_ is an administrative boundary (i.e., a grouping of namespaces used to assign access rights to users). +There's more basic info on provisioning clusters in the headings below, but for full information, see [Provisioning Kubernetes Clusters]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/). + ### Clusters In Rancher v1.6, compute nodes were added to an _environment_. Rancher v2.x eschews the term _environment_ for _cluster_, as Kubernetes uses this term for a team of computers instead of _environment_. @@ -72,7 +74,8 @@ Rancher v2.x lets you launch a Kubernetes cluster anywhere. Host your cluster us - Any [custom node(s)]({{< baseurl >}}rancher/v2.x/en/cluster-provisioning/rke-clusters/custom-nodes/). Rancher can launch Kubernetes on the nodes, be they bare metal servers, virtual machines, or cloud hosts on a less popular infrastructure provider. ### Projects -Additionally, Rancher v2.x introduces [projects]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/), which are objects that divide clusters into different application groups that are useful for applying user permissions. This model of clusters and projects allow for multi-tenancy because hosts are owned by the cluster, and the cluster can be further divided into multiple projects where users can manage their apps. + +Additionally, Rancher v2.x introduces [projects]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/), which are objects that divide clusters into different application groups that are useful for applying user permissions. This model of clusters and projects allow for multi-tenancy because hosts are owned by the cluster, and the cluster can be further divided into multiple projects where users can manage their apps, but not those of others. When you create a cluster, two projects are automatically created: diff --git a/content/rancher/v2.x/en/v1.6-migration/kub-intro/_index.md b/content/rancher/v2.x/en/v1.6-migration/kub-intro/_index.md index 917d3ff8e3d..e161bd54e0b 100644 --- a/content/rancher/v2.x/en/v1.6-migration/kub-intro/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/kub-intro/_index.md @@ -11,10 +11,10 @@ The following table introduces and defines some key Kubernetes concepts. | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Cluster | A collection of machines that run containerized applications managed by Kubernetes. | | Namespace | A virtual cluster, multiple of which can be supported by a single physical cluster. | -| Node | One of the physical (or virtual) machines that make up a cluster. | +| Node | One of the physical or virtual machines that make up a cluster. | | Pod | The smallest and simplest Kubernetes object. A pod represents a set of running [containers](https://kubernetes.io/docs/concepts/overview/what-is-kubernetes/#why-containers) on your cluster. | | Deployment | An API object that manages a replicated application. | -| Workload | Units of work that are running on the cluster, these can be pods or deployments. | +| Workload | Units of work that are running on the cluster. These can be pods or deployments. | ## Migration Cheatsheet @@ -34,4 +34,6 @@ Because Rancher v1.6 defaulted to our Cattle container orchestrator, it primaril
More detailed information on Kubernetes concepts can be found in the -[Kubernetes Concepts Documentation](https://kubernetes.io/docs/concepts/). \ No newline at end of file +[Kubernetes Concepts Documentation](https://kubernetes.io/docs/concepts/). + +### [Next: Get Started]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/get-started/) \ No newline at end of file diff --git a/content/rancher/v2.x/en/v1.6-migration/load-balancing/_index.md b/content/rancher/v2.x/en/v1.6-migration/load-balancing/_index.md index 42bde942359..3e44d37acb8 100644 --- a/content/rancher/v2.x/en/v1.6-migration/load-balancing/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/load-balancing/_index.md @@ -22,7 +22,7 @@ If you encounter the `output.txt` text below after parsing your v1.6 Compose fil - [Load Balancing Architecture](#load-balancing-architecture) - [Ingress Caveats](#ingress-caveats) - [Deploying Ingress](#deploying-ingress) -- [Rancher v2.x Load Balancing Limitations](#rancher-v2x-load-balancing-limitations) +- [Rancher v2.x Load Balancing Limitations](#rancher-v2-x-load-balancing-limitations) diff --git a/content/rancher/v2.x/en/v1.6-migration/monitor-apps/_index.md b/content/rancher/v2.x/en/v1.6-migration/monitor-apps/_index.md index 52bd7cb7d08..538c60f370b 100644 --- a/content/rancher/v2.x/en/v1.6-migration/monitor-apps/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/monitor-apps/_index.md @@ -208,4 +208,4 @@ Rancher v1.6 Compose Parameter | Rancher v2.x Kubernetes Parameter `initializing_timeout` | `initialDelaySeconds` `strategy` | `restartPolicy` -### [Next: Schedule Workloads]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/schedule-workloads/) \ No newline at end of file +### [Next: Schedule Your Services]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/schedule-workloads/) \ No newline at end of file