From 635e1aae6a49b26e17f4aee81eb9dcd192a06cac Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Thu, 19 Mar 2020 15:41:32 -0700 Subject: [PATCH] Update docs on importing K3s clusters --- .../rancher/v2.x/en/cluster-provisioning/_index.md | 1 + .../cluster-provisioning/imported-clusters/_index.md | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/content/rancher/v2.x/en/cluster-provisioning/_index.md b/content/rancher/v2.x/en/cluster-provisioning/_index.md index c9e23d21752..31c97b0aa06 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/_index.md @@ -23,6 +23,7 @@ This section covers the following topics: - [Launching Kubernetes and Provisioning Nodes in an Infrastructure Provider](#launching-kubernetes-and-provisioning-nodes-in-an-infrastructure-provider) - [Launching Kubernetes on Existing Custom Nodes](#launching-kubernetes-on-existing-custom-nodes) - [Importing Existing Clusters](#importing-existing-clusters) + - [Importing and Editing K3s Clusters](#importing-and-editing-k3s-clusters) The following table summarizes the options and settings available for each cluster type: diff --git a/content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md b/content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md index 635a8349c44..5c32602c760 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md @@ -16,9 +16,11 @@ For all imported Kubernetes clusters except for K3s clusters, the configuration Rancher v2.4 added the capability to import a K3s cluster into Rancher, as well as the ability to upgrade Kubernetes by editing the cluster in the Rancher UI. +- [Features](#features) - [Prerequisites](#prerequisites) - [Importing a cluster](#importing-a-cluster) - [Additional features for imported K3s clusters](#additional-features-for-imported-k3s-clusters) +- [Configuring a K3s Cluster to Enable Importation to Rancher](#configuring-a-k3s-cluster-to-enable-importation-to-rancher) ### Features @@ -29,7 +31,7 @@ After importing a cluster, the cluster owner can: - Enable [Istio]({{}}/rancher/v2.x/en/cluster-admin/tools/istio/) - Use [pipelines]({{}}/rancher/v2.x/en/project-admin/pipelines/) - Configure [alerts]({{}}/rancher/v2.x/en/cluster-admin/tools/alerts/) and [notifiers]({{}}/rancher/v2.x/en/cluster-admin/tools/notifiers/) -- Manage [projects]() and [workloads]() +- Manage [projects]({{}}/rancher/v2.x/en/project-admin/) and [workloads]({{}}/rancher/v2.x/en/k8s-in-rancher/workloads/) After importing a K3s cluster, the cluster owner can also [upgrade Kubernetes from the Rancher UI.]({{}}/rancher/v2.x/en/cluster-admin/upgrading-kubernetes/) @@ -49,9 +51,9 @@ before running the `kubectl` command to import the cluster. By default, GKE users are not given this privilege, so you will need to run the command before importing GKE clusters. To learn more about role-based access control for GKE, please click [here](https://cloud.google.com/kubernetes-engine/docs/how-to/role-based-access-control). -### Importing a Cluster +> If you are importing a K3s cluster, make sure the `cluster.yml` is readable. It is protected by default. For details, refer to [Configuring a K3s cluster to enable importation to Rancher.](#configuring-a-k3s-cluster-to-enable-importation-to-rancher) -> **Prerequisites:** If you are importing a K3s cluster, make sure the `cluster.yml` is readable. It is protected by default. For details, refer to [Configuring a K3s cluster to enable importation to Rancher.](#configuring-a-k3s-cluster-to-enable-importation-to-rancher) +### Importing a Cluster 1. From the **Clusters** page, click **Add Cluster**. 2. Choose **Import**. @@ -71,7 +73,7 @@ By default, GKE users are not given this privilege, so you will need to run the _Available as of v2.4.0_ -You can now import a K3s cluster into Rancher. [K3s]({{}}/k3s/latest/en/) is lightweight, fully compliant Kubernetes distribution. You can also upgrade Kubernetes by editing the cluster in the Rancher UI. +You can now import a K3s Kubernetes cluster into Rancher. [K3s]({{}}/k3s/latest/en/) is lightweight, fully compliant Kubernetes distribution. You can also upgrade Kubernetes by editing the K3s cluster in the Rancher UI. When a K3s cluster is imported, Rancher will recognize it as K3s, and the Rancher UI will expose the following features in addition to the functionality for other imported clusters: @@ -81,7 +83,7 @@ When a K3s cluster is imported, Rancher will recognize it as K3s, and the Ranche The **concurrency** is the maximum number of nodes that are permitted to be unavailable during an upgrade. If number of unavailable nodes is larger than the **concurrency,** the upgrade will fail. If an upgrade fails, you may need to repair or remove failed nodes before the upgrade can succeed. -- **Server concurrency:** The maximum number of server nodes to upgrade at a single time; also the maximum unavailable server nodes +- **Controlplane concurrency:** The maximum number of server nodes to upgrade at a single time; also the maximum unavailable server nodes - **Worker concurrency:** The maximum number worker nodes to upgrade at the same time; also the maximum unavailable worker nodes In the K3s documentation, controlplane nodes are called server nodes. These nodes run the Kubernetes master, which maintains the desired state of the cluster. In K3s, these controlplane nodes have the capability to have workloads scheduled to them by default.