From 3300efdb9556671abd88a31f728ec38a39777126 Mon Sep 17 00:00:00 2001 From: Dan Ramich Date: Wed, 29 Aug 2018 14:04:30 -0700 Subject: [PATCH 01/17] Update _index.md --- .../en/admin-settings/rbac/default-custom-roles/_index.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md index 45bae9fcb9d..197f6aacd8c 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md @@ -22,6 +22,8 @@ While Rancher comes out-of-the-box with a set of default user roles, you can als 1. From the **Global** view, select **Security > Roles** from the main menu. + + 2. Click **Add Role**. 3. **Name** the role. @@ -29,7 +31,10 @@ While Rancher comes out-of-the-box with a set of default user roles, you can als 4. Choose whether to set the role to a status of [locked]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/locked-roles/). Locked roles cannot be assigned to users. - + 5. Assign the role a **Context**. Context determines the scope of role assigned to the user. The contexts are: - **All** From e8d0ad18386cb564f0a330b88466cbaeb9c5c1e0 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Tue, 4 Sep 2018 12:45:00 -0700 Subject: [PATCH 02/17] editing language --- .../rancher/v2.x/en/v1.6-migration/_index.md | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 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 1682cf4ae93..419e680dea4 100644 --- a/content/rancher/v2.x/en/v1.6-migration/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/_index.md @@ -4,48 +4,52 @@ weight: 10000 draft: true --- +In Rancher 1.6, Cattle was the default container-orchestration platform. Rancher users preferred Cattle for creating and managing applications based on Docker containers. With the release of Rancher 2.0, Kubernetes replaces Cattle as the default orchestration platform, bringing new technology and specifications. Thus, Cattle users who want to upgrade to Rancher 2.0 must find ways to migrate their apps from 1.6 to 2.0. -### Checklist for migration of a 1.6 setup to 2.0 +In this blog series, we explore how you can map features from Cattle in Rancher 1.6 to Kubernetes in Rancher 2.0. + +### Checklist for Migration from a 1.6 Setup to 2.0 + +Rancher 2.0 differs from Rancher 1.6 because it brings in a new orchestration technology, Kubernetes. Currently, there is no straightforward upgrade path available between Rancher 1.6 and Rancher 2.0. + +As a Rancher 1.6 user who’s interested in moving your setup to 2.0, what steps should you take? The following blog provides a short checklist to help with this transition. Blog Post: https://rancher.com/blog/2018/2018-08-09-migrate-1dot6-setup-to-2dot0/ -### Concepts of Stack, Service -How to map Cattle's Stack and service design to k8s world and launch a simple service +### Rancher 1.6 Stack, Service, Environment and the Parallels in Rancher 2.0 + +In Rancher 1.6, you launch applications as _services_, and you organize them under _stacks_ in an _environment_. Rancher 1.6 supports the Docker compose standard and provides import/export for application configurations using the following file types: `docker-compose.yml` and `rancher-compose.yml`. + +The following article explores how to map Cattle's stack and service design to Kubernetes. It also demonstrates how to migrate a simple application from Rancher 1.6 to 2.0 using either the Rancher UI or Docker Compose. Blog Post: https://rancher.com/blog/2018/2018-08-02-journey-from-cattle-to-k8s/ +### Exposing Your Services Publicly—Port Mapping in Rancher 2.0 -### Exposing your service publicly -How to publicly expose your Service using port mapping in 1.6 and its equivalent 2.0 method +In Rancher 1.6, you could provide external access to your applications using port mapping. This article explores how to publicly expose your services in Rancher 2.0. It explores both UI and CLI methods to transition the port mapping functionality to 2.0. Blog Post: https://rancher.com/blog/2018/expose-and-monitor-workloads/ -### Monitoring a service using healthchecks -How to add TCP/HTTP healthchecks in Rancher 2.0 +### Monitoring Your Application using Healthchecks in Rancher 2.0 + +Rancher 1.6 provided TCP and HTTP healthchecks using its own healthcheck microservice. This article overviews healthcheck support and how to configure it in Rancher 2.0. Blog Post: https://rancher.com/blog/2018/2018-08-22-k8s-monitoring-and-healthchecks/ -### Scheduling rules for placement of service containers & Global Service -How to find equivalence in 2.0 for scheduling your containers using host affinity/anti-affinity and other 1.6 scheduling labels -How to launch a global service in 2.0 +### Scheduling Rules for Placement of Service Containers & Global Services in Rancher 2.0 + +Scheduling application containers on available resources is a key container orchestration technique. The following blog reviews how to schedule containers in Rancher 2.0 for those familiar with 1.6 scheduling labels (such as affinity and anti-affinity). It also explores how to launch a global service in 2.0. Blog Post: Coming soon! -### Service Discovery: Rancher internal DNS -How to discover services, use external_name/alias in 2.0 +### Service Discovery: Rancher Internal DNS + +Rancher 1.6 provides service discovery within and across stacks using its own internal DNS microservice. It also supports pointing to external services and creating aliases. Moving to Rancher 2.0, you can replicate this same service discovery behavior. The following blog reviews this topic and the solutions needed to achieve service discovery parity in Rancher 2.0. Blog Post: Coming soon! -### LoadBalancing -How to achieve TCP/HTTP load balancing and configure hostname/path based routing in 2.0 +### Load Balancing + +How to achieve TCP/HTTP load balancing and configure hostname/path-based routing in Rancher 2.0. Blog Post: Coming soon! - - From 03f5ba5c00773b440084ce75460cd4bcb0a039c0 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Tue, 4 Sep 2018 15:18:17 -0700 Subject: [PATCH 03/17] adding docs about cluster membership revokement --- .../rbac/cluster-project-roles/_index.md | 62 ++++++++++--------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md index ca77ffb96ed..3e2c72055f9 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md @@ -33,15 +33,15 @@ Rancher lets you assign _custom cluster roles_ to a user instead of the typical The following table lists each built-in custom cluster role available in Rancher and whether it is also granted by the `Owner` or `Member` role. -| Custom Cluster Role | Owner | Member | -| ---------------------------------- | ------------- | ------------- | -| Manage Cluster Members | ✓ | | -| Manage Nodes | ✓ | | -| Manage Storage | ✓ | | -| View All Projects | ✓ | | -| Create Project | ✓ | ✓ | -| View Cluster Members | ✓ | ✓ | -| View Nodes | ✓ | ✓ | +| Custom Cluster Role | Owner | Member | +| ---------------------------------- | ------------- | --------------------------------- | +| Manage Cluster Members | ✓ | | +| Manage Nodes | ✓ | | +| Manage Storage | ✓ | | +| View All Projects | ✓ | | +| Create Project | ✓ | ✓ | +| View Cluster Members | ✓ | ✓ | +| View Nodes | ✓ | ✓ | > **Note:** Each cluster role listed above, including `Owner` and `Member`, is comprised of multiple rules granting access to various resources. You can view the roles and their rules on the Global > Security > Roles page. @@ -69,25 +69,25 @@ Rancher lets you assign _custom project roles_ to a user instead of the typical The following table lists each built-in custom project role available in Rancher and whether it is also granted by the `Owner`, `Member`, or `Read Only` role. -| Custom Cluster Role | Owner | Member | Read Only | -| ---------------------------------- | ------------- | ------------- | ------------- | -| Manage Project Members | ✓ | | | -| Create Namespaces | ✓ | ✓ | | -| Manage Config Maps | ✓ | ✓ | | -| Manage Ingress | ✓ | ✓ | | -| Manage Secrets | ✓ | ✓ | | -| Manage Service Accounts | ✓ | ✓ | | -| Manage Services | ✓ | ✓ | | -| Manage Volumes | ✓ | ✓ | | -| Manage Workloads | ✓ | ✓ | | -| View Config Maps | ✓ | ✓ | ✓ | -| View Ingress | ✓ | ✓ | ✓ | -| View Project Members | ✓ | ✓ | ✓ | -| View Secrets | ✓ | ✓ | ✓ | -| View Service Accounts | ✓ | ✓ | ✓ | -| View Services | ✓ | ✓ | ✓ | -| View Volumes | ✓ | ✓ | ✓ | -| View Workloads | ✓ | ✓ | ✓ | +| Custom Cluster Role | Owner | Member | Read Only | +| ---------------------------------- | ------------- | ----------------------------- | ------------- | +| Manage Project Members | ✓ | | | +| Create Namespaces | ✓ | ✓ | | +| Manage Config Maps | ✓ | ✓ | | +| Manage Ingress | ✓ | ✓ | | +| Manage Secrets | ✓ | ✓ | | +| Manage Service Accounts | ✓ | ✓ | | +| Manage Services | ✓ | ✓ | | +| Manage Volumes | ✓ | ✓ | | +| Manage Workloads | ✓ | ✓ | | +| View Config Maps | ✓ | ✓ | ✓ | +| View Ingress | ✓ | ✓ | ✓ | +| View Project Members | ✓ | ✓ | ✓ | +| View Secrets | ✓ | ✓ | ✓ | +| View Service Accounts | ✓ | ✓ | ✓ | +| View Services | ✓ | ✓ | ✓ | +| View Volumes | ✓ | ✓ | ✓ | +| View Workloads | ✓ | ✓ | ✓ | > **Note:** Each project role listed above, including Owner, Member, and Read Only, is comprised of multiple rules granting access to various resources. You can view the roles and their rules on the Global > Security > Roles page. @@ -133,4 +133,8 @@ You can change the cluster or project role(s) that are automatically assigned to 1. If you want to remove a default role, edit the permission and select **No** from the default roles option. -**Result:** The default roles are configured based on your changes. Roles assigned to cluster/project creators display a check in the **Cluster/Project Creator Default** column. \ No newline at end of file +**Result:** The default roles are configured based on your changes. Roles assigned to cluster/project creators display a check in the **Cluster/Project Creator Default** column. + +### Cluster Membership Revocation Behavior + +When you revoke the cluster membership for a user assigned the **Member** permission, that user [loses their cluster roles](#clus-roles) for the cluster, but [retains their project roles](#proj-roles). In other words, although you have revoked the user's permissions to access the cluster and its nodes, the user can still access and manage the projects and namespaces they've created previously. This functionality is intended to prevent project and namespace owners from being locked out of their own projects and namespaces. \ No newline at end of file From 6c7210e717e81ed2f50716c5bf894989e62899c6 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Sep 2018 11:48:09 -0700 Subject: [PATCH 04/17] small edits --- .../v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md index 3e2c72055f9..be3976c4657 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md @@ -137,4 +137,4 @@ You can change the cluster or project role(s) that are automatically assigned to ### Cluster Membership Revocation Behavior -When you revoke the cluster membership for a user assigned the **Member** permission, that user [loses their cluster roles](#clus-roles) for the cluster, but [retains their project roles](#proj-roles). In other words, although you have revoked the user's permissions to access the cluster and its nodes, the user can still access and manage the projects and namespaces they've created previously. This functionality is intended to prevent project and namespace owners from being locked out of their own projects and namespaces. \ No newline at end of file +When you revoke the cluster membership for a user assigned the **Member** permission, that user [loses their cluster roles](#clus-roles) for the cluster but [retains their project roles](#proj-roles), which the user inherited through their now-revoked cluster membership. In other words, although you have revoked the user's permissions to access the cluster and its nodes, the user can still access and manage the projects and namespaces they've created previously. This functionality is intended to prevent project and namespace owners from being locked out of their own projects and namespaces. \ No newline at end of file From 3c5c6314553fbf429b5c3f19b3ce3c49dc2be593 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Sep 2018 12:42:59 -0700 Subject: [PATCH 05/17] adding description of what happens when you revoke a users's cluster access but not their project access --- .../en/admin-settings/rbac/cluster-project-roles/_index.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md index be3976c4657..305f7cf3da7 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md @@ -137,4 +137,9 @@ You can change the cluster or project role(s) that are automatically assigned to ### Cluster Membership Revocation Behavior -When you revoke the cluster membership for a user assigned the **Member** permission, that user [loses their cluster roles](#clus-roles) for the cluster but [retains their project roles](#proj-roles), which the user inherited through their now-revoked cluster membership. In other words, although you have revoked the user's permissions to access the cluster and its nodes, the user can still access and manage the projects and namespaces they've created previously. This functionality is intended to prevent project and namespace owners from being locked out of their own projects and namespaces. \ No newline at end of file +When you revoke the cluster membership for a user that's explicitly assigned membership to both the cluster _and_ a project within the cluster, that user [loses their cluster roles](#clus-roles) but [retains their project roles](#proj-roles). In other words, although you have revoked the user's permissions to access the cluster and its nodes, the user can still access and manage: + +- The projects they hold membership in. +- The namespaces that they've created. + +This functionality is intended to prevent project and namespace owners from being locked out of their own projects and namespaces. If you want to completely revoke a user's access within a cluster, revoke both their cluster and project memberships. \ No newline at end of file From 4c2d970e5880234cb244670ea6c8c747f4554230 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Sep 2018 16:41:56 -0700 Subject: [PATCH 06/17] add version labels for default custom role option and UI change. --- .../rbac/default-custom-roles/_index.md | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md index 197f6aacd8c..11caf489f34 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md @@ -22,20 +22,31 @@ While Rancher comes out-of-the-box with a set of default user roles, you can als 1. From the **Global** view, select **Security > Roles** from the main menu. - +1. **v2.0.7 and later only:** Select a tab to determine the scope of the roles you're adding. The tabs are: -2. Click **Add Role**. + - **Cluster** -3. **Name** the role. + The role is valid for assignment when adding/managing members to _only_ clusters. -4. Choose whether to set the role to a status of [locked]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/locked-roles/). + - **Project** + + The role is valid for assignment when adding/managing members to _only_ projects. + + >**Note:** You cannot edit the Global tab. + +1. Click **Add Cluster/Project Role**. + +1. **Name** the role. + +1. Choose whether to set the role to a status of [locked]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/locked-roles/). Locked roles cannot be assigned to users. - -5. Assign the role a **Context**. Context determines the scope of role assigned to the user. The contexts are: + +1. **v2.0.7 and later only:** Choose a **Cluster/Project Creator Default** option setting. Use this option to set if the role is assigned to a user when they create a new cluster or project. Using this feature, you can expand or restrict the default roles for cluster/project creators. + + >**Note:** Out of the box, the Cluster Creator Default and the Project Creator Default roles are `Cluster Owner` and `Project Owner` respectively. + +1. **v2.0.6 and earlier only:** Assign the role a **Context**. Context determines the scope of role assigned to the user. The contexts are: - **All** From 88ca052b5af6c3ac8dcb88bf388bd2e8ef82b4e9 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Sep 2018 17:06:36 -0700 Subject: [PATCH 07/17] adding content from Chris Urwin's migration blog --- .../rancher/v2.x/en/v1.6-migration/_index.md | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) 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 419e680dea4..7a8f1d7ab15 100644 --- a/content/rancher/v2.x/en/v1.6-migration/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/_index.md @@ -53,3 +53,85 @@ Blog Post: Coming soon! How to achieve TCP/HTTP load balancing and configure hostname/path-based routing in Rancher 2.0. Blog Post: Coming soon! + + +s we near the end of the development process for Rancher 2.0, we thought it might be useful to provide a glossary of terms that will help Rancher users understand the fundamental concepts in Kubernetes and Rancher. + +In the move from Rancher 1.6 to Rancher 2.0, we have aligned more with the Kubernetes naming standard. This shift could be confusing for people who have only used Cattle environments under Rancher 1.6. + +This article aims to help you understand the new concepts in Rancher 2.0. It can also act as an easy reference for terms and concepts between the container orchestrators Cattle and Kubernetes. + +## Rancher 1.6 Cattle compared with Rancher 2.0 Kubernetes + +Rancher 1.6 offered Cattle as a container orchestrator and many users chose to use it. In Cattle, you have an **environment** , which is both an administrative and a compute boundary, i.e., the lowest level at which you can assign permissions; importantly, all hosts in that environment were dedicated to that environment and that environment alone. Then, to organize your containers, you had a **Stack** , which was a logical grouping of a collection of services, with a service being a particular running image. + +So, how does this structure look under under 2.0? + + If you are working in the container space, then it is unlikely that you haven't heard some of the buzz words around Kubernetes, such as **pods, namespaces** and **nodes**. What this article aims to do is ease the transition from Cattle to Kubernetes by aligning the terms of both orchestrators. Along with some of the names changing, some of the capabilities have changed as well. + +#### The following table gives a definition of some of the core Kubernetes concepts + +| **Concept** | **Definition** | +| --- | --- | +| Cluster | 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 (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. | + +> _More detailed information on Kubernetes concepts can be found at +[https://kubernetes.io/docs/concepts/](https://kubernetes.io/docs/concepts/)_ + +### ENVIRONMENTS + +The environment in Rancher 1.6 represented 2 things: + +- The Compute boundary +- The administrative boundary + +In 2.0 the environment concept doesn't exist, instead it becomes replaced by: + +- **Cluster** – The compute boundary +- **Project** – An administrative boundary + +A **Project** is an administrative layer introduced by Rancher to ease the burden of administration in Kubernetes. + +### HOST + +In Cattle, a host could only belong to one environment, things are similar in that **nodes** (the new name for hosts!) can only belong to one **cluster**. What used to be an environment with hosts, is now a cluster with nodes. + +### STACK + +A stack in Rancher 1.6 is a way to group a number of services. In Rancher 2.0 this is done via **namespaces**. + +### SERVICE + +In Rancher 1.6, a service was defined as one or more instances of the same container running. In Rancher 2.0, one or more instances of the same container running are defined as a **workload** , where a **workload** can be made up of a **pod** (s) running with a controller. + +### CONTAINER + +A container image is a lightweight, stand-alone, executable package of a piece of software that includes everything needed to run it: code, runtime, system tools, system libraries, settings, etc. Within Rancher 1.6, a container was the minimal definition required to run an application. Under Kubernetes, a pod is the minimal definition. A **pod** can be a single image, or it can be a number of images that all share the same storage/network and description of how they interact. **Pod** contents are always co-located and co-scheduled, and run in a shared context. + +### LOAD BALANCER + +In Rancher 1.6, a Load Balancer was used to expose your applications from within the Rancher environment for access externally. In Rancher 2.0, the concept is the same. There is a Load Balancer option to expose your services. In the language of Kubernetes, this function is more often referred to as an **Ingress**. In short, Load Balancer and Ingress play the same role. + +## Conclusion + +In terms of concepts, Cattle was the closest orchestrator to Kubernetes out of all of the orchestrators. Hopefully this article will act as an easy reference for people moving from Rancher 1.6 to 2.0. Plus, the similarity between the two orchestrators should allow for an easier transition. + +#### The following table gives a quick reference for the old versus new terms. + +| **Rancher 1.6** | **Rancher 2.0** | +| --- | --- | +| Container | Pod | +| Services | Workload | +| Load Balancer | Ingress | +| Stack | Namespace | +| Environment | Project (Administration)/Cluster (Compute) | +| Host | Node | +| Catalog | Helm | + + +> _For further reading and training, check out our free online training series: [Introduction to Kubernetes and Rancher](https://rancher.com/training/)._ From 41abd054d75c2b1b25aee013a52667c8c014dde0 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Sep 2018 18:07:33 -0700 Subject: [PATCH 08/17] organized basic structure --- .../rancher/v2.x/en/v1.6-migration/_index.md | 169 +++++++++--------- 1 file changed, 80 insertions(+), 89 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 7a8f1d7ab15..fbe0e29ca64 100644 --- a/content/rancher/v2.x/en/v1.6-migration/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/_index.md @@ -6,9 +6,58 @@ draft: true In Rancher 1.6, Cattle was the default container-orchestration platform. Rancher users preferred Cattle for creating and managing applications based on Docker containers. With the release of Rancher 2.0, Kubernetes replaces Cattle as the default orchestration platform, bringing new technology and specifications. Thus, Cattle users who want to upgrade to Rancher 2.0 must find ways to migrate their apps from 1.6 to 2.0. -In this blog series, we explore how you can map features from Cattle in Rancher 1.6 to Kubernetes in Rancher 2.0. +## Kubernetes Basics -### Checklist for Migration from a 1.6 Setup to 2.0 +Rancher 2.0 is built on the [Kubernetes](https://kubernetes.io/docs/home/?path=users&persona=app-developer&level=foundational) container orchestrator. This shift in underlying technology for 2.0 is a large departure from 1.6, which supported several popular container orchestrators. Since Rancher is now based entirely on Kubernetes, it's helpful to learn the Kubernetes basics. + +The following table introduces and defines some key Kubernetes concepts. + +| **Concept** | **Definition** | +| ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Cluster | 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 (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. | + + +## Migration Cheatsheet + +Because Rancher 1.6 was container orchestrator agnostic, it used a generic vocabulary that could be understood regardless of what container orchestrator you used. However, because Rancher 2.0 uses Kubernetes, it aligns with the Kubernetes naming standard. This shift could be confusing for people unfamiliar with Kubernetes. + +The following tables maps terms used in Rancher 1.6 to Rancher 2.0. + +| **Rancher 1.6** | **Rancher 2.0** | **Definition** | +| --- | --- | --- | +| Container | Pod | placeholder | +| Services | Workload | placeholder | +| Load Balancer | Ingress | placeholder | +| Stack | Namespace | placeholder | +| Environment | Project (Administration)/Cluster (Compute) | placeholder | +| Host | Node | placeholder | +| Catalog | Helm | placeholder | +
+More detailed information on Kubernetes concepts can be found at +[https://kubernetes.io/docs/concepts/](https://kubernetes.io/docs/concepts/). + + +## Migration Plan + + + +- [1. Get Started](#1-get-started) +- [2. Migrate Applications](#2-migrate-applications) +- [3. Expose Your Services](#3-expose-your-services) +- [4. Monitor Your Applications](#4-monitor-your-applications) +- [5. Schedule Deployments](#5-schedule-deployments) +- [6. Service Discovery](#6-service-discovery) +- [7. Load Balancing](#7-load-balancing) + + + + +## 1. Get Started Rancher 2.0 differs from Rancher 1.6 because it brings in a new orchestration technology, Kubernetes. Currently, there is no straightforward upgrade path available between Rancher 1.6 and Rancher 2.0. @@ -16,7 +65,7 @@ As a Rancher 1.6 user who’s interested in moving your setup to 2.0, what steps Blog Post: https://rancher.com/blog/2018/2018-08-09-migrate-1dot6-setup-to-2dot0/ -### Rancher 1.6 Stack, Service, Environment and the Parallels in Rancher 2.0 +## 2. Migrate Applications In Rancher 1.6, you launch applications as _services_, and you organize them under _stacks_ in an _environment_. Rancher 1.6 supports the Docker compose standard and provides import/export for application configurations using the following file types: `docker-compose.yml` and `rancher-compose.yml`. @@ -24,67 +73,6 @@ The following article explores how to map Cattle's stack and service design to K Blog Post: https://rancher.com/blog/2018/2018-08-02-journey-from-cattle-to-k8s/ -### Exposing Your Services Publicly—Port Mapping in Rancher 2.0 - -In Rancher 1.6, you could provide external access to your applications using port mapping. This article explores how to publicly expose your services in Rancher 2.0. It explores both UI and CLI methods to transition the port mapping functionality to 2.0. - -Blog Post: https://rancher.com/blog/2018/expose-and-monitor-workloads/ - -### Monitoring Your Application using Healthchecks in Rancher 2.0 - -Rancher 1.6 provided TCP and HTTP healthchecks using its own healthcheck microservice. This article overviews healthcheck support and how to configure it in Rancher 2.0. - -Blog Post: https://rancher.com/blog/2018/2018-08-22-k8s-monitoring-and-healthchecks/ - -### Scheduling Rules for Placement of Service Containers & Global Services in Rancher 2.0 - -Scheduling application containers on available resources is a key container orchestration technique. The following blog reviews how to schedule containers in Rancher 2.0 for those familiar with 1.6 scheduling labels (such as affinity and anti-affinity). It also explores how to launch a global service in 2.0. - -Blog Post: Coming soon! - -### Service Discovery: Rancher Internal DNS - -Rancher 1.6 provides service discovery within and across stacks using its own internal DNS microservice. It also supports pointing to external services and creating aliases. Moving to Rancher 2.0, you can replicate this same service discovery behavior. The following blog reviews this topic and the solutions needed to achieve service discovery parity in Rancher 2.0. - -Blog Post: Coming soon! - -### Load Balancing - -How to achieve TCP/HTTP load balancing and configure hostname/path-based routing in Rancher 2.0. - -Blog Post: Coming soon! - - -s we near the end of the development process for Rancher 2.0, we thought it might be useful to provide a glossary of terms that will help Rancher users understand the fundamental concepts in Kubernetes and Rancher. - -In the move from Rancher 1.6 to Rancher 2.0, we have aligned more with the Kubernetes naming standard. This shift could be confusing for people who have only used Cattle environments under Rancher 1.6. - -This article aims to help you understand the new concepts in Rancher 2.0. It can also act as an easy reference for terms and concepts between the container orchestrators Cattle and Kubernetes. - -## Rancher 1.6 Cattle compared with Rancher 2.0 Kubernetes - -Rancher 1.6 offered Cattle as a container orchestrator and many users chose to use it. In Cattle, you have an **environment** , which is both an administrative and a compute boundary, i.e., the lowest level at which you can assign permissions; importantly, all hosts in that environment were dedicated to that environment and that environment alone. Then, to organize your containers, you had a **Stack** , which was a logical grouping of a collection of services, with a service being a particular running image. - -So, how does this structure look under under 2.0? - - If you are working in the container space, then it is unlikely that you haven't heard some of the buzz words around Kubernetes, such as **pods, namespaces** and **nodes**. What this article aims to do is ease the transition from Cattle to Kubernetes by aligning the terms of both orchestrators. Along with some of the names changing, some of the capabilities have changed as well. - -#### The following table gives a definition of some of the core Kubernetes concepts - -| **Concept** | **Definition** | -| --- | --- | -| Cluster | 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 (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. | - -> _More detailed information on Kubernetes concepts can be found at -[https://kubernetes.io/docs/concepts/](https://kubernetes.io/docs/concepts/)_ - -### ENVIRONMENTS - The environment in Rancher 1.6 represented 2 things: - The Compute boundary @@ -97,41 +85,44 @@ In 2.0 the environment concept doesn't exist, instead it becomes replaced by A **Project** is an administrative layer introduced by Rancher to ease the burden of administration in Kubernetes. -### HOST +A container image is a lightweight, stand-alone, executable package of a piece of software that includes everything needed to run it: code, runtime, system tools, system libraries, settings, etc. Within Rancher 1.6, a container was the minimal definition required to run an application. Under Kubernetes, a pod is the minimal definition. A **pod** can be a single image, or it can be a number of images that all share the same storage/network and description of how they interact. **Pod** contents are always co-located and co-scheduled, and run in a shared context. In Cattle, a host could only belong to one environment, things are similar in that **nodes** (the new name for hosts!) can only belong to one **cluster**. What used to be an environment with hosts, is now a cluster with nodes. -### STACK -A stack in Rancher 1.6 is a way to group a number of services. In Rancher 2.0 this is done via **namespaces**. +## 3. Expose Your Services -### SERVICE +In Rancher 1.6, you could provide external access to your applications using port mapping. This article explores how to publicly expose your services in Rancher 2.0. It explores both UI and CLI methods to transition the port mapping functionality to 2.0. + +Blog Post: https://rancher.com/blog/2018/expose-and-monitor-workloads/ In Rancher 1.6, a service was defined as one or more instances of the same container running. In Rancher 2.0, one or more instances of the same container running are defined as a **workload** , where a **workload** can be made up of a **pod** (s) running with a controller. -### CONTAINER +A stack in Rancher 1.6 is a way to group a number of services. In Rancher 2.0 this is done via **namespaces**. -A container image is a lightweight, stand-alone, executable package of a piece of software that includes everything needed to run it: code, runtime, system tools, system libraries, settings, etc. Within Rancher 1.6, a container was the minimal definition required to run an application. Under Kubernetes, a pod is the minimal definition. A **pod** can be a single image, or it can be a number of images that all share the same storage/network and description of how they interact. **Pod** contents are always co-located and co-scheduled, and run in a shared context. +## 4. Monitor Your Applications -### LOAD BALANCER +Rancher 1.6 provided TCP and HTTP healthchecks using its own healthcheck microservice. This article overviews healthcheck support and how to configure it in Rancher 2.0. + +Blog Post: https://rancher.com/blog/2018/2018-08-22-k8s-monitoring-and-healthchecks/ + +## 5. Schedule Deployments + +Scheduling application containers on available resources is a key container orchestration technique. The following blog reviews how to schedule containers in Rancher 2.0 for those familiar with 1.6 scheduling labels (such as affinity and anti-affinity). It also explores how to launch a global service in 2.0. + +Blog Post: Coming soon! + +## 6. Service Discovery + +Rancher 1.6 provides service discovery within and across stacks using its own internal DNS microservice. It also supports pointing to external services and creating aliases. Moving to Rancher 2.0, you can replicate this same service discovery behavior. The following blog reviews this topic and the solutions needed to achieve service discovery parity in Rancher 2.0. + +Blog Post: Coming soon! + +## 7. Load Balancing + +How to achieve TCP/HTTP load balancing and configure hostname/path-based routing in Rancher 2.0. + +Blog Post: Coming soon! In Rancher 1.6, a Load Balancer was used to expose your applications from within the Rancher environment for access externally. In Rancher 2.0, the concept is the same. There is a Load Balancer option to expose your services. In the language of Kubernetes, this function is more often referred to as an **Ingress**. In short, Load Balancer and Ingress play the same role. -## Conclusion - -In terms of concepts, Cattle was the closest orchestrator to Kubernetes out of all of the orchestrators. Hopefully this article will act as an easy reference for people moving from Rancher 1.6 to 2.0. Plus, the similarity between the two orchestrators should allow for an easier transition. - -#### The following table gives a quick reference for the old versus new terms. - -| **Rancher 1.6** | **Rancher 2.0** | -| --- | --- | -| Container | Pod | -| Services | Workload | -| Load Balancer | Ingress | -| Stack | Namespace | -| Environment | Project (Administration)/Cluster (Compute) | -| Host | Node | -| Catalog | Helm | - - -> _For further reading and training, check out our free online training series: [Introduction to Kubernetes and Rancher](https://rancher.com/training/)._ From b379e47cbaa5d27cf381cf3e14cb51d6c7e4df3b Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 7 Sep 2018 11:02:59 -0700 Subject: [PATCH 09/17] updating description of what users can do within projects after their cluster membership is revoked --- .../en/admin-settings/rbac/cluster-project-roles/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md index 305f7cf3da7..3c2d2a6dbae 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md @@ -137,9 +137,9 @@ You can change the cluster or project role(s) that are automatically assigned to ### Cluster Membership Revocation Behavior -When you revoke the cluster membership for a user that's explicitly assigned membership to both the cluster _and_ a project within the cluster, that user [loses their cluster roles](#clus-roles) but [retains their project roles](#proj-roles). In other words, although you have revoked the user's permissions to access the cluster and its nodes, the user can still access and manage: +When you revoke the cluster membership for a user that's explicitly assigned membership to both the cluster _and_ a project within the cluster, that user [loses their cluster roles](#clus-roles) but [retains their project roles](#proj-roles). In other words, although you have revoked the user's permissions to access the cluster and its nodes, the user can still: -- The projects they hold membership in. -- The namespaces that they've created. +- Access the projects they hold membership in. +- Exercise any [individual project roles](#project-role-reference) they are assigned. This functionality is intended to prevent project and namespace owners from being locked out of their own projects and namespaces. If you want to completely revoke a user's access within a cluster, revoke both their cluster and project memberships. \ No newline at end of file From 5d4581bf914f0a27391faaa1030d002e959dac13 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 7 Sep 2018 11:56:42 -0700 Subject: [PATCH 10/17] touching up graphics --- src/diagrams/rancher2ha-l4.xml | 2 +- src/diagrams/rancher2ha-l7.xml | 2 +- src/img/rancher/ha/rancher2ha-l7.svg | 2 +- src/img/rancher/ha/rancher2ha.svg | 2 +- src/img/rancher/port-communications.svg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/diagrams/rancher2ha-l4.xml b/src/diagrams/rancher2ha-l4.xml index 820b731440d..ec7f0ea88bf 100644 --- a/src/diagrams/rancher2ha-l4.xml +++ b/src/diagrams/rancher2ha-l4.xml @@ -1 +1 @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/src/diagrams/rancher2ha-l7.xml b/src/diagrams/rancher2ha-l7.xml index 2ffaa721842..c525d6373da 100644 --- a/src/diagrams/rancher2ha-l7.xml +++ b/src/diagrams/rancher2ha-l7.xml @@ -1 +1 @@ -7Vxbd6LKEv41Weuch8yCBow+qhjDbBtjxDHxDYEgCuJGkMuv39XQqAhOzMUke7aTtSbQt+r66qvqLqBzxbWdqOupqxl2dcO+QoweXXHiFUJIQBz8IiVxVlJrCFmB6Vl6VsTuCoZWYtBChpYGlm6sCw1917V9a1Us1Nzl0tD8QpnqeW5YbPbs2kWpK9U0SgVDTbXLpWNL92dZaV1gduV3hmXOcsksQ2umqrYwPTdYUnlXiHtO/2XVjpqPRduvZ6ruhntFXOeKa3uu62dXTtQ2bIJtDlvW7/ZI7XbenrH0T+nAZx02qh0Y+YxrNnRt6daGzM+PKSa1vwMyqZZvRP61alvm8oprEhOAJMODC6hLoV761+vUoKSWra+iXV+4MunvVAZpnFrRdr2CEICN08lPue+DutRmqcC2HaxT0dlgoGQ2XlEGFKeqFEu/q3Z536lXocf51HvVNAryUEEOSqlvEHKxUB3OLN8YrlSN1IYQKqBs5js2rd6Sn9xormNpcE2QXvueuzDaW+C4m3q70b7d1uQ+iQjKlm3vtWSYG6FZh3KqpUhV5Fobw/MtcPEmrfDdFTXSrepYNolUK3e1spYQO1q2OjXs1taZcwFLdwmqtFxQyfJJD47ZokDGN6KjfshuvRuipuE6hu/F0IR24AQaIGnA5Gl8CHfRp4Zok9le5BHyQKLSiGduh955PVxQx68OAvWjQYBSuEykQ0eoVTnC1lV/y+B9jn1bNhVo4rlT13dp6V5rQ3tmntkq7pmeqlvGrjHl0QcQ5yZfailxENf4IZS4g9gK7rB51/dwJx+4QJ4DMxIfKvnaFsSjINDFXZ3m4zCvBYfPl2UKDtdgy9AwldDU3w/NzQtuVblavOxqfJWrybAFg0ruFb52pOF3c8GtU53kghzPN4TO6eH/NA8Uqln2KSxiq7Zon+hgR3TP1y30o7hwceXgw+aL2T429Q9Yt1juZWi+nL+NhsqpJy8hHEt+PnwJ4V8k8PmMxJaMJC1Nz1ivyRYetPdc2yabhAPDgS1W5NJy0lxt6789sjO7d9eWb7kEIMDRd52jDq6uV1mC+GxFhAYtOp6oq74KETW7RbfrjXmFWhFQAbXv72Q0iVv8dBwFWsJY6t0Do4nupkf27LHA4VjYaI62wfNmiNuNRHc0S7qb+dOukPSXs7U6Frz74U9Xv3sI+1Z9Q/b6vaWW9JxGPInrUV9ZCD0uaydZLaSOf3EDp8HfD6VQEpsmVjpsb96J+qLGSqLEwDUvJxInDyWY431XM/W7n7PpUnam3E8fJDGacxtoKJrp3ZHbUzpRbz5CeC6xUpuJ8JCP8HwQY2th3c+j8OnxwZW69gL6zUA6+e1jZRBgccD1RcxLIo57cy2Wk5GAl09Qt4C6J0aeL9ip2BF68yaMPRD6w2bUH/KhPB+gvvILgdy0ThafBJipOXHs9VRkrKnTCCZwr3EP8RT5Nmg5x+IiBNkJ6LFR0QiQs4PJWJ5p0F5zGuzUGQCiMujV8CZDliBlq05jNZ1X1nPq+IFRoS/I3ex0HDQkh2HkNo8yJAkuBMmR35s/kd8mYBP3xU4sDxlAHANOIxN0QrLyRMoCeW4C6k3oJ6XW2O+HlbRuv18iixjKeI7WkX48ViRWFTsB4JL1VZoBnU+QyhmHVA4D7QeAJ9hNxEFfSdv7/TYZR0vH6Sk4IPVqmwFWNBNSNiU2bvNRNmc+xAnoM8Y+zDEBhoJNJdAXbAXye4oEMjErz5upfKxoAhZNVCyH60ec6iyLZozjJvBhRPpzYHNynYCsUE6vf61li/CLYJrNB3gQQF2S38NcuR7Rbxz6OOZBXoot6mXYQrtFQvSUYzLOL7ffBhwTLcbz2zXoIMC8UnzBjiEWCQ4/3Z2e6ZiRnGR2hTEQFjugh5TbmODApDLHJrkmdWzmI4OwD5zHj64ldSeraTdsSBYO+0rT6iV8XeveMmo78w85aYIPdGBeZkx5lI7zFBObQR9xwRNfwMpT0h8ygMuAl5UmL6e2k0AXCeGsnHIxxZvoiwA/FvyPxaLtyo9P/t79nNhNno8EgilOJAFsGaXXpFyUhMxuxG8HCbVhagtMxiD4HNFNf5RtqTuz1bHu6uA3wEkW+iSgUwx+SePJBKIcAz7EzsBPV0ab4NfMIhRwG5N5KBjsOTJhngzMAeYqJX+Br+vIXuhdsyHNNeJ/IHfA9NuSaXSj1dRZ19S7n/YEfFlCnXQ+EG2LMpcP8dNYSKZgg8nQDMj8+sSGSgdk4QRsEQKm/F9ZRLxrQeQzTXVMPF6yqOdHENHAi5oCTr0OA4IaA8gJUhbFeGB3RK+BQSYrW18atVgNjUy1+2s1QTMG5MH8R8AYTCI59MsQmcAaMlVgfuNbGMfm/wLvTy0CTANWxeA9AjCAB68NX2cJKbVED2l7iE4IEooWEoQAPR5bzUQmsU8kcQr4mfKyyfcVU+hV8p+p5P+Oq+m6EZJyiJ0II5PV5/v3mPgdxOOFmcWzBY/nHT+Nv2IHrAnlwHUZ4gK03/GexikSf4w9q0oJsKFN0A43E6ItByt9wpMdx6t3z6dssPIeh7tktlbeJVel6Pnz2XdtwGr/ogwdcWVkzphbfUGKji4p+jlS9NpXpuhVD1A/0cOO6P4tUvTGJUU/jcD1r0vRc1JdUvRLin5J0S8p+iVFv6TolxT9kqL/WSn6kQ3Wd0jRUfkdyZEE4vMy8Xr5C5TzZVC5vp+ZiLP/lUR891XTZ2Tix2j2OTw64Y3w+x3ppW+5vjLhrvyi87vx9Dsk3BlVvijhLn80dUm4Lwn3JeG+JNyXhPuScF8S7kvC/e9PuI9tsL5Dws2d8E58t0tmijviueH7MT2zpgYpIK7nz1zTXcJWzCVbLPH3b0NpZ9CYawFeXvxIpaQ3T+QGwIHbyPIf6WjkeldT2JVnUzf00pm2g9wf1HMDT6Ot8nzLVz3TyLFF1TbzDFv1rU1x/CoD0K73rpVm6HlGxB+85W80ikNkc6C9Dsy4ncZpW+sXD7NUn8fKcoyXznK98SBMT43TQ2Q35WcLPVfVoQZyG3Wp7c7KvPjw4X93inI//P8JzzDeOunvlza+7juD2/RfVdp46IInhbOXnp4VCc4JVadwUEU+yebnRN4Vz07I+kl8GNLbXbzq7Epb3yDifURca1TEtSMPf98Z167Zg/NFDDoprjU9T433mq1Ig/Vv5AjV8fP2be3hIpvBm4Ns+auO3bHc0UMP/n8w/g6MtV9iITmBWiSXZ0Akos/bCCMoGNBaaF0JZBNCKLemBDr9aeWaHNJcmkrKzmu+gojVdKX9HqiLXtc/JkJcIwEVjVKvlzc89YoI8RFHPLnyJx5VT5d2vqer61lVKCiGb/rA7SBO08PN9BTt3nOpksVe+eDKDXzbWoL0/NQ/U0WH/CmZE5nkrxP8cJ+fLc34sTa0wLP8+IdGxoYi1S8HvWNryHtePP2WFohji6xgy+9dhHqZFMJHkKLq88fLLph+FvrhqwWLilGZbxzYMJtXabUoDYRqB8tO/oLh47fT3AmfNv4XKXIehhwadvtO9rUMKX1WzZ+PIa/6wvO8DDknC85j8dqBoWpvtfjNQXDhDncNH2dx/oS9xJ9g8TMtAwJ/LpMz7NlMfsIHKn+CydF5nn/x9QOTcx9k8tLb6DebHG53f3Uqa777015c5x8= \ No newline at end of file +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 \ No newline at end of file diff --git a/src/img/rancher/ha/rancher2ha-l7.svg b/src/img/rancher/ha/rancher2ha-l7.svg index 725da754024..b6de5911297 100644 --- a/src/img/rancher/ha/rancher2ha-l7.svg +++ b/src/img/rancher/ha/rancher2ha-l7.svg @@ -1,2 +1,2 @@ -
Rancher Cluster


[Not supported by viewer]
Rancher
[Not supported by viewer]
Node 3
[Not supported by viewer]Ingress Controller
Node 2
[Not supported by viewer]Ingress Controller
Node 1
[Not supported by viewer]Ingress Controller
Layer 7
Load Balancer
(HTTPS)
[Not supported by viewer]
Rancher URL Request
Rancher URL Request \ No newline at end of file +
Rancher Cluster


[Not supported by viewer]
Node 3
[Not supported by viewer]Ingress Controller
Ingress Controller
Ingress Controller
Node 2
[Not supported by viewer]Ingress Controller
Ingress Controller
Ingress Controller
Node 1
[Not supported by viewer]
Ingress Controller
Ingress Controller
Layer 7
Load Balancer
(HTTPS)
[Not supported by viewer]
Rancher URL Request
Rancher URL Request \ No newline at end of file diff --git a/src/img/rancher/ha/rancher2ha.svg b/src/img/rancher/ha/rancher2ha.svg index 8981f454cbd..806f8c8a100 100644 --- a/src/img/rancher/ha/rancher2ha.svg +++ b/src/img/rancher/ha/rancher2ha.svg @@ -1,2 +1,2 @@ -
Rancher Cluster


[Not supported by viewer]
Rancher
[Not supported by viewer]
Node 3
[Not supported by viewer]Ingress Controller(HTTPS)
Node 2
[Not supported by viewer]Ingress Controller(HTTPS)
Node 1
[Not supported by viewer]Ingress Controller(HTTPS)
Layer 4
Load Balancer
(TCP)
[Not supported by viewer]
Rancher URL Request
Rancher URL Request \ No newline at end of file +
Rancher Cluster


[Not supported by viewer]
Layer 4
Load Balancer
(TCP)
[Not supported by viewer]
Rancher URL Request
Rancher URL Request
Node 2
[Not supported by viewer]Ingress Controller(HTTPS)
Ingress Controller
(HTTPS)
Ingress Controller<br>(HTTPS)<br>
Node 3
[Not supported by viewer]Ingress Controller(HTTPS)
Ingress Controller
(HTTPS)
Ingress Controller<br>(HTTPS)<br>
Node 1
[Not supported by viewer]Ingress Controller(HTTPS)
Ingress Controller
(HTTPS)
Ingress Controller<br>(HTTPS)<br> \ No newline at end of file diff --git a/src/img/rancher/port-communications.svg b/src/img/rancher/port-communications.svg index 7953709f117..73d53de581d 100644 --- a/src/img/rancher/port-communications.svg +++ b/src/img/rancher/port-communications.svg @@ -1,2 +1,2 @@ -

Rancher Management Plane
[Not supported by viewer]
Text
Text
Rancher Launched Kubernetes

 Nodes hosted by an IaaS. 
  • Amazon EC2
  • DigitalOcean
  • Azure
  • vSphere
[Not supported by viewer]
Rancher Launched Kubernetes

 
  Cluster with custom nodes.
[Not supported by viewer]
Imported Clusters
  • kops
  • Tectonic
  • RKE CLI
  • non-Rancher provisioned cloud cluster
[Not supported by viewer]
Hosted Kubernetes Provider

 Provisioned by Rancher.
  • Google GKE
  • Amazon EKS
  • Microsoft AKS
[Not supported by viewer]
 ▲ Rancher Server TLS: 443
[Not supported by viewer]
▲ Rancher Server TLS: 443
[Not supported by viewer]
▼ SSH: 22
▼ Docker Daemon TLS: 2376
[Not supported by viewer]
 ▲ Rancher Server TLS: 443
[Not supported by viewer]
 ▼ Kubernetes API: 6443
[Not supported by viewer]
 ▲ Rancher Server TLS: 443
[Not supported by viewer] \ No newline at end of file +

                    Rancher Management Plane
[Not supported by viewer]
Text
Text
Rancher Launched Kubernetes

 
  Cluster with custom nodes.
[Not supported by viewer]
Imported Clusters
  • kops
  • Tectonic
  • RKE CLI
  • non-Rancher provisioned cloud cluster
[Not supported by viewer]
Hosted Kubernetes Provider

 Provisioned by Rancher.
  • Google GKE
  • Amazon EKS
  • Microsoft AKS
[Not supported by viewer]
 ▲ Rancher Server TLS: 443
[Not supported by viewer]
▲ Rancher Server TLS: 443
[Not supported by viewer]
▼ SSH: 22
▼ Docker Daemon TLS: 2376
[Not supported by viewer]
 ▲ Rancher Server TLS: 443
[Not supported by viewer]
 ▼ Kubernetes API: 6443
[Not supported by viewer]
 ▲ Rancher Server TLS: 443
[Not supported by viewer]
Rancher Launched Kubernetes

 Nodes hosted by an IaaS. 
  • Amazon EC2
  • Digital Ocean
  • Azure
  • Vsphere
[Not supported by viewer] \ No newline at end of file From 446d39d39afb42ac6616b12cf1e0e12eabca0568 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 7 Sep 2018 12:13:23 -0700 Subject: [PATCH 11/17] removed references to namespaces --- .../v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md index 3c2d2a6dbae..4a1458b9a16 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md @@ -142,4 +142,4 @@ When you revoke the cluster membership for a user that's explicitly assigned mem - Access the projects they hold membership in. - Exercise any [individual project roles](#project-role-reference) they are assigned. -This functionality is intended to prevent project and namespace owners from being locked out of their own projects and namespaces. If you want to completely revoke a user's access within a cluster, revoke both their cluster and project memberships. \ No newline at end of file +This functionality is intended to prevent project owners from being locked out of their own projects. If you want to completely revoke a user's access within a cluster, revoke both their cluster and project memberships. \ No newline at end of file From 9d75d7f59bc05b75a03bab1f22cde78774a58d6f Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 7 Sep 2018 12:18:14 -0700 Subject: [PATCH 12/17] removing sentence about intent --- .../v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md index 4a1458b9a16..e78abc06b00 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md @@ -142,4 +142,4 @@ When you revoke the cluster membership for a user that's explicitly assigned mem - Access the projects they hold membership in. - Exercise any [individual project roles](#project-role-reference) they are assigned. -This functionality is intended to prevent project owners from being locked out of their own projects. If you want to completely revoke a user's access within a cluster, revoke both their cluster and project memberships. \ No newline at end of file +If you want to completely revoke a user's access within a cluster, revoke both their cluster and project memberships. \ No newline at end of file From a285bcf13d485068cee34feaa39248bffe8773f6 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 7 Sep 2018 15:41:15 -0700 Subject: [PATCH 13/17] making edits to get this published ASAP --- .../rancher/v2.x/en/v1.6-migration/_index.md | 88 ++++++++----------- 1 file changed, 35 insertions(+), 53 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 fbe0e29ca64..6e45a1e1740 100644 --- a/content/rancher/v2.x/en/v1.6-migration/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/_index.md @@ -4,7 +4,9 @@ weight: 10000 draft: true --- -In Rancher 1.6, Cattle was the default container-orchestration platform. Rancher users preferred Cattle for creating and managing applications based on Docker containers. With the release of Rancher 2.0, Kubernetes replaces Cattle as the default orchestration platform, bringing new technology and specifications. Thus, Cattle users who want to upgrade to Rancher 2.0 must find ways to migrate their apps from 1.6 to 2.0. +Rancher 2.0 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 1.6.x to 2.x, but rather a migration of your 1.6 application workloads into the 2.0 Kubernetes equivalent. In 1.6, the most common orchestration used was Rancher's own engine called Cattle. The following blogs (that will be converted in an official guide) explain and educate our Cattle users on running workloads in a Kubernetes environment. + +If you are an existing Kubernetes user on Rancher 1.6, you only need to review the [Get Started](#1-get-started)} section to prepare you on what to expect on a new 2.0 Rancher cluster. ## Kubernetes Basics @@ -14,32 +16,30 @@ The following table introduces and defines some key Kubernetes concepts. | **Concept** | **Definition** | | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Cluster | Collection of machines that run containerized applications managed by Kubernetes. | +| 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 (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. | +| 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 -Because Rancher 1.6 was container orchestrator agnostic, it used a generic vocabulary that could be understood regardless of what container orchestrator you used. However, because Rancher 2.0 uses Kubernetes, it aligns with the Kubernetes naming standard. This shift could be confusing for people unfamiliar with Kubernetes. +Because Rancher 1.6 defaulted to our Cattle container orchestrator, it primarily used terminology related to Cattle. However, because Rancher 2.0 uses Kubernetes, it aligns with the Kubernetes naming standard. This shift could be confusing for people unfamiliar with Kubernetes, so we've created a table that maps terms commonly used in Rancher 1.6 to their equivalents in Rancher 2.0. -The following tables maps terms used in Rancher 1.6 to Rancher 2.0. - -| **Rancher 1.6** | **Rancher 2.0** | **Definition** | -| --- | --- | --- | -| Container | Pod | placeholder | -| Services | Workload | placeholder | -| Load Balancer | Ingress | placeholder | -| Stack | Namespace | placeholder | -| Environment | Project (Administration)/Cluster (Compute) | placeholder | -| Host | Node | placeholder | -| Catalog | Helm | placeholder | +| **Rancher 1.6** | **Rancher 2.0** | +| --- | --- | +| Container | Pod | +| Services | Workload | +| Load Balancer | Ingress | +| Stack | Namespace | +| Environment | Project (Administration)/Cluster (Compute) +| Host | Node | +| Catalog | Helm |
-More detailed information on Kubernetes concepts can be found at -[https://kubernetes.io/docs/concepts/](https://kubernetes.io/docs/concepts/). +More detailed information on Kubernetes concepts can be found in the +[Kubernetes Concepts Documentation](https://kubernetes.io/docs/concepts/). ## Migration Plan @@ -52,7 +52,7 @@ More detailed information on Kubernetes concepts can be found at - [4. Monitor Your Applications](#4-monitor-your-applications) - [5. Schedule Deployments](#5-schedule-deployments) - [6. Service Discovery](#6-service-discovery) -- [7. Load Balancing](#7-load-balancing) + @@ -61,68 +61,50 @@ More detailed information on Kubernetes concepts can be found at Rancher 2.0 differs from Rancher 1.6 because it brings in a new orchestration technology, Kubernetes. Currently, there is no straightforward upgrade path available between Rancher 1.6 and Rancher 2.0. -As a Rancher 1.6 user who’s interested in moving your setup to 2.0, what steps should you take? The following blog provides a short checklist to help with this transition. +As a Rancher 1.6 user who's interested in moving to 2.0, how should you get started with migration? The following blog provides a short checklist to help with this transition. -Blog Post: https://rancher.com/blog/2018/2018-08-09-migrate-1dot6-setup-to-2dot0/ +Blog Post: [Migrating from Rancher 1.6 to Rancher 2.0—A Short Checklist](https://rancher.com/blog/2018/2018-08-09-migrate-1dot6-setup-to-2dot0/) ## 2. Migrate Applications -In Rancher 1.6, you launch applications as _services_, and you organize them under _stacks_ in an _environment_. Rancher 1.6 supports the Docker compose standard and provides import/export for application configurations using the following file types: `docker-compose.yml` and `rancher-compose.yml`. +In Rancher 1.6, you launch applications as _services_ and organize them under _stacks_ in an _environment_, which represents a compute and administrative boundary. Rancher 1.6 supports the Docker compose standard and provides import/export for application configurations using the following files: `docker-compose.yml` and `rancher-compose.yml`. In 2.0 the environment concept doesn't exist. Instead it's replaced by: + +- **Cluster:** The compute boundary. +- **Project:** An administrative boundary. The following article explores how to map Cattle's stack and service design to Kubernetes. It also demonstrates how to migrate a simple application from Rancher 1.6 to 2.0 using either the Rancher UI or Docker Compose. -Blog Post: https://rancher.com/blog/2018/2018-08-02-journey-from-cattle-to-k8s/ - -The environment in Rancher 1.6 represented 2 things: - -- The Compute boundary -- The administrative boundary - -In 2.0 the environment concept doesn't exist, instead it becomes replaced by: - -- **Cluster** – The compute boundary -- **Project** – An administrative boundary - -A **Project** is an administrative layer introduced by Rancher to ease the burden of administration in Kubernetes. - -A container image is a lightweight, stand-alone, executable package of a piece of software that includes everything needed to run it: code, runtime, system tools, system libraries, settings, etc. Within Rancher 1.6, a container was the minimal definition required to run an application. Under Kubernetes, a pod is the minimal definition. A **pod** can be a single image, or it can be a number of images that all share the same storage/network and description of how they interact. **Pod** contents are always co-located and co-scheduled, and run in a shared context. - -In Cattle, a host could only belong to one environment, things are similar in that **nodes** (the new name for hosts!) can only belong to one **cluster**. What used to be an environment with hosts, is now a cluster with nodes. - +Blog Post: [A Journey from Cattle to Kubernetes!](https://rancher.com/blog/2018/2018-08-02-journey-from-cattle-to-k8s/) ## 3. Expose Your Services -In Rancher 1.6, you could provide external access to your applications using port mapping. This article explores how to publicly expose your services in Rancher 2.0. It explores both UI and CLI methods to transition the port mapping functionality to 2.0. +In Rancher 1.6, you could provide external access to your applications using port mapping. This article explores how to publicly expose your services in Rancher 2.0. It explores both UI and CLI methods to transition the port mapping functionality. -Blog Post: https://rancher.com/blog/2018/expose-and-monitor-workloads/ - -In Rancher 1.6, a service was defined as one or more instances of the same container running. In Rancher 2.0, one or more instances of the same container running are defined as a **workload** , where a **workload** can be made up of a **pod** (s) running with a controller. - -A stack in Rancher 1.6 is a way to group a number of services. In Rancher 2.0 this is done via **namespaces**. +Blog Post: [From Cattle to Kubernetes—How to Publicly Expose Your Services in Rancher 2.0](https://rancher.com/blog/2018/expose-and-monitor-workloads/) ## 4. Monitor Your Applications -Rancher 1.6 provided TCP and HTTP healthchecks using its own healthcheck microservice. This article overviews healthcheck support and how to configure it in Rancher 2.0. +Rancher 1.6 provided TCP and HTTP healthchecks using its own healthcheck microservice. Rancher 2.0 uses native Kubernetes healthcheck support instead. This article overviews how to configure it in Rancher 2.0. -Blog Post: https://rancher.com/blog/2018/2018-08-22-k8s-monitoring-and-healthchecks/ +Blog Post: [From Cattle to Kubernetes—Application Healthchecks in Rancher 2.0](https://rancher.com/blog/2018/2018-08-22-k8s-monitoring-and-healthchecks/) ## 5. Schedule Deployments Scheduling application containers on available resources is a key container orchestration technique. The following blog reviews how to schedule containers in Rancher 2.0 for those familiar with 1.6 scheduling labels (such as affinity and anti-affinity). It also explores how to launch a global service in 2.0. -Blog Post: Coming soon! +Blog Post: [From Cattle to Kubernetes—Scheduling Workloads in Rancher 2.0](https://rancher.com/blog/2018/2018-08-29-scheduling-options-in-2-dot-0/) ## 6. Service Discovery Rancher 1.6 provides service discovery within and across stacks using its own internal DNS microservice. It also supports pointing to external services and creating aliases. Moving to Rancher 2.0, you can replicate this same service discovery behavior. The following blog reviews this topic and the solutions needed to achieve service discovery parity in Rancher 2.0. -Blog Post: Coming soon! +Blog Post: [From Cattle to Kubernetes—Service Discovery in Rancher 2.0](https://rancher.com/blog/2018/2018-09-04-service_discovery_2dot0/) -## 7. Load Balancing + From b63225bcd129a8af1ece16fb618b3a100e1bb070 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 7 Sep 2018 16:02:41 -0700 Subject: [PATCH 14/17] fixed typo --- content/rancher/v2.x/en/v1.6-migration/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 65ca99338ca..5c0abfb7dac 100644 --- a/content/rancher/v2.x/en/v1.6-migration/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/_index.md @@ -6,7 +6,7 @@ draft: true Rancher 2.0 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 1.6.x to 2.x, but rather a migration of your 1.6 application workloads into the 2.0 Kubernetes equivalent. In 1.6, the most common orchestration used was Rancher's own engine called Cattle. The following blogs (that will be converted in an official guide) explain and educate our Cattle users on running workloads in a Kubernetes environment. -If you are an existing Kubernetes user on Rancher 1.6, you only need to review the [Get Started](#1-get-started)} section to prepare you on what to expect on a new 2.0 Rancher cluster. +If you are an existing Kubernetes user on Rancher 1.6, you only need to review the [Get Started](#1-get-started) section to prepare you on what to expect on a new 2.0 Rancher cluster. ## Kubernetes Basics From 316741e7b1fc50760169cf6e6e3787a6122e1996 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 7 Sep 2018 16:14:24 -0700 Subject: [PATCH 15/17] making minor edits to get started. --- content/rancher/v2.x/en/v1.6-migration/_index.md | 2 -- 1 file changed, 2 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 6e45a1e1740..104d44cc80d 100644 --- a/content/rancher/v2.x/en/v1.6-migration/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/_index.md @@ -59,8 +59,6 @@ More detailed information on Kubernetes concepts can be found in the ## 1. Get Started -Rancher 2.0 differs from Rancher 1.6 because it brings in a new orchestration technology, Kubernetes. Currently, there is no straightforward upgrade path available between Rancher 1.6 and Rancher 2.0. - As a Rancher 1.6 user who's interested in moving to 2.0, how should you get started with migration? The following blog provides a short checklist to help with this transition. Blog Post: [Migrating from Rancher 1.6 to Rancher 2.0—A Short Checklist](https://rancher.com/blog/2018/2018-08-09-migrate-1dot6-setup-to-2dot0/) From 51c9dd3694657107938feb6f5e6a479a117c4240 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 7 Sep 2018 16:26:38 -0700 Subject: [PATCH 16/17] removing draft flag --- content/rancher/v2.x/en/v1.6-migration/_index.md | 4 ++++ 1 file changed, 4 insertions(+) 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 50d666c683a..754ecfbc468 100644 --- a/content/rancher/v2.x/en/v1.6-migration/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/_index.md @@ -1,7 +1,11 @@ --- title: Migrating from Rancher v1.6 to v2.x +<<<<<<< HEAD weight: 8500 draft: true +======= +weight: 10000 +>>>>>>> removing draft flag --- Rancher 2.0 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 1.6.x to 2.x, but rather a migration of your 1.6 application workloads into the 2.0 Kubernetes equivalent. In 1.6, the most common orchestration used was Rancher's own engine called Cattle. The following blogs (that will be converted in an official guide) explain and educate our Cattle users on running workloads in a Kubernetes environment. From cb4ce500486f21b8cdfe6f2af497d05103335f49 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 7 Sep 2018 16:37:50 -0700 Subject: [PATCH 17/17] fixed rebase text --- content/rancher/v2.x/en/v1.6-migration/_index.md | 5 ----- 1 file changed, 5 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 754ecfbc468..91edab61a1b 100644 --- a/content/rancher/v2.x/en/v1.6-migration/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/_index.md @@ -1,11 +1,6 @@ --- title: Migrating from Rancher v1.6 to v2.x -<<<<<<< HEAD -weight: 8500 -draft: true -======= weight: 10000 ->>>>>>> removing draft flag --- Rancher 2.0 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 1.6.x to 2.x, but rather a migration of your 1.6 application workloads into the 2.0 Kubernetes equivalent. In 1.6, the most common orchestration used was Rancher's own engine called Cattle. The following blogs (that will be converted in an official guide) explain and educate our Cattle users on running workloads in a Kubernetes environment.