From d87952e71cdd7f68350ee72b545432989bf5a26e Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 5 Oct 2018 15:13:18 -0700 Subject: [PATCH] fixing force push --- .../v2.x/en/admin-settings/removing-rancher/_index.md | 6 +++--- .../removing-rancher/rancher-cluster-nodes/_index.md | 6 +++--- .../removing-rancher/user-cluster-nodes/_index.md | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/content/rancher/v2.x/en/admin-settings/removing-rancher/_index.md b/content/rancher/v2.x/en/admin-settings/removing-rancher/_index.md index 535919c18c5..22e572b83e0 100644 --- a/content/rancher/v2.x/en/admin-settings/removing-rancher/_index.md +++ b/content/rancher/v2.x/en/admin-settings/removing-rancher/_index.md @@ -7,10 +7,10 @@ When you deploy Rancher and use it to provision clusters, Rancher installs its c There are two contexts in which you'd remove Rancher from a Kubernetes cluster node. -- [Removing Rancher from Rancher-Provisioned Nodes]({{< baseurl >}}/rancher/v2.x/en/admin-settings/removing-rancher/user-cluster-nodes/) +- [Removing Rancher Components from Rancher Launched Kubernetes Clusters]({{< baseurl >}}/rancher/v2.x/en/admin-settings/removing-rancher/user-cluster-nodes/) - In this context, you are removing Rancher from Kubernetes clusters that you provisioned using Rancher. + In this context, you are removing Rancher components from Kubernetes clusters that you [launched using Rancher]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/). - [Removing Rancher from Your Rancher Server Nodes]({{< baseurl >}}/rancher/v2.x/en/admin-settings/removing-rancher/rancher-cluster-nodes/) - In this context, you are removing Rancher from the Kubernetes cluster that your configured for your Rancher installation. + In this context, you are removing Rancher from the Kubernetes cluster that you configured for your [Rancher installation]({{< baseurl >}}/rancher/v2.x/en/installation/ha/). diff --git a/content/rancher/v2.x/en/admin-settings/removing-rancher/rancher-cluster-nodes/_index.md b/content/rancher/v2.x/en/admin-settings/removing-rancher/rancher-cluster-nodes/_index.md index e0ca4e8d802..bda2d63808d 100644 --- a/content/rancher/v2.x/en/admin-settings/removing-rancher/rancher-cluster-nodes/_index.md +++ b/content/rancher/v2.x/en/admin-settings/removing-rancher/rancher-cluster-nodes/_index.md @@ -1,5 +1,5 @@ --- -title: Removing Rancher from Rancher Server Nodes +title: Removing Rancher from Your Rancher Server Nodes weight: 2000 --- @@ -64,12 +64,12 @@ export KUBECONFIG=$(pwd)/kube_config_rancher-cluster.yml ## What Gets Removed? -When removing Rancher from server nodes provisioned using RKE, the following components are deleted. +When removing Rancher from server nodes launched using RKE, the following components are deleted. - The Rancher deployment namespace (`cattle-system` by default). - Any `serviceAccount`, `clusterRoles`, and `clusterRoleBindings` that Rancher applied the `cattle.io/creator:norman` label to. Rancher applies this label to any resource that it creates as of v2.1.0. -- Labels, Annotations, and Finalizers. +- Labels, annotations, and finalizers. - Rancher Deployment. - Machines, clusters, projects, and user custom resource deployments (CRDs). - All resources create under the `management.cattle.io` API Group. diff --git a/content/rancher/v2.x/en/admin-settings/removing-rancher/user-cluster-nodes/_index.md b/content/rancher/v2.x/en/admin-settings/removing-rancher/user-cluster-nodes/_index.md index 8ac921c100c..5431793e941 100644 --- a/content/rancher/v2.x/en/admin-settings/removing-rancher/user-cluster-nodes/_index.md +++ b/content/rancher/v2.x/en/admin-settings/removing-rancher/user-cluster-nodes/_index.md @@ -1,14 +1,14 @@ --- -title: Removing Rancher from Rancher-Provisioned Nodes +title: Removing Rancher Components from Rancher Launched Kubernetes Nodes weight: 375 aliases: - /rancher/v2.x/en/installation/removing-rancher/cleaning-cluster-nodes/ - /rancher/v2.x/en/installation/removing-rancher/ - /rancher/v2.x/en/faq/cleaning-cluster-nodes/ --- -When you use Rancher to [provision nodes for a cluster]({{< baseurl >}}rancher/v2.x/en/cluster-provisioning/#cluster-creation-in-rancher), resources (containers/virtual network interfaces) and configuration items (certificates/configuration files) are created. +When you use Rancher to [launch nodes for a cluster]({{< baseurl >}}rancher/v2.x/en/cluster-provisioning/#cluster-creation-in-rancher), resources (containers/virtual network interfaces) and configuration items (certificates/configuration files) are created. -When removing nodes from your Rancher-provisioned cluster (provided that they are in `Active` state), those resources automatically cleaned, and the only action needed is to restart the node. When a node has become unreachable and the automatic cleanup process cannot be used, we describe the steps that need to be executed before the node can be added to a cluster again. +When removing nodes from your Rancher-launched cluster (provided that they are in `Active` state), those resources automatically cleaned, and the only action needed is to restart the node. When a node has become unreachable and the automatic cleanup process cannot be used, we describe the steps that need to be executed before the node can be added to a cluster again. ## What Gets Removed?