diff --git a/content/rancher/v2.x/en/cluster-admin/nodes/_index.md b/content/rancher/v2.x/en/cluster-admin/nodes/_index.md index 6c58354f550..35c4ac21e34 100644 --- a/content/rancher/v2.x/en/cluster-admin/nodes/_index.md +++ b/content/rancher/v2.x/en/cluster-admin/nodes/_index.md @@ -12,7 +12,7 @@ This section covers the following topics: - [Node options available for each cluster creation option](#node-options-available-for-each-cluster-creation-option) - [Nodes hosted by an infrastructure provider](#nodes-hosted-by-an-infrastructure-provider) - [Nodes provisioned by hosted Kubernetes providers](#nodes-provisioned-by-hosted-kubernetes-providers) - - [Imported nodes](#imported-nodes) + - [Registered/Imported nodes](#registered-imported-nodes) - [Managing and editing individual nodes](#managing-and-editing-individual-nodes) - [Viewing a node in the Rancher API](#viewing-a-node-in-the-rancher-api) - [Deleting a node](#deleting-a-node) @@ -38,9 +38,9 @@ The following table lists which node options are available for each type of clus | [Drain](#draining-a-node) | ✓ | ✓ | ✓ | ✓ | ✓ | Marks the node as unschedulable _and_ evicts all pods. | | [Edit](#managing-and-editing-individual-nodes) | ✓ | ✓ | ✓ | ✓ | ✓ | Enter a custom name, description, label, or taints for a node. | | [View API](#viewing-a-node-in-the-rancher-api) | ✓ | ✓ | ✓ | ✓ | ✓ | View API data. | -| [Delete](#deleting-a-node) | ✓ | ✓ | | | | Deletes defective nodes from the cluster. | +| [Delete](#deleting-a-node) | ✓ | ✓ | | * | * | Deletes defective nodes from the cluster. | | [Download Keys](#ssh-into-a-node-hosted-by-an-infrastructure-provider) | ✓ | | | | | Download SSH key in order to SSH into the node. | -| [Node Scaling](#scaling-nodes) | ✓ | | | | | Scale the number of nodes in the node pool up or down. | +| [Node Scaling](#scaling-nodes) | ✓ | | | ✓ | | Scale the number of nodes in the node pool up or down. | [1]: {{}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/ [2]: {{}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/custom-nodes/ @@ -48,14 +48,16 @@ The following table lists which node options are available for each type of clus [4]: {{}}/rancher/v2.x/en/cluster-provisioning/registered-clusters/ [5]: {{}}/rancher/v2.x/en/cluster-provisioning/registered-clusters/ +\* Delete option accessible via View API + {{% /tab %}} {{% tab "Rancher v2.0-v2.4" %}} | Option | [Nodes Hosted by an Infrastructure Provider][1] | [Custom Node][2] | [Hosted Cluster][3] | [Imported Nodes][4] | Description | | ------------------------------------------------ | ------------------------------------------------ | ---------------- | ------------------- | ------------------- | ------------------------------------------------------------------ | -| [Cordon](#cordoning-a-node) | ✓ | ✓ | ✓ | | Marks the node as unschedulable. | -| [Drain](#draining-a-node) | ✓ | ✓ | ✓ | | Marks the node as unschedulable _and_ evicts all pods. | -| [Edit](#managing-and-editing-individual-nodes) | ✓ | ✓ | ✓ | | Enter a custom name, description, label, or taints for a node. | -| [View API](#viewing-a-node-in-the-rancher-api) | ✓ | ✓ | ✓ | | View API data. | +| [Cordon](#cordoning-a-node) | ✓ | ✓ | ✓ | ✓ | Marks the node as unschedulable. | +| [Drain](#draining-a-node) | ✓ | ✓ | ✓ | ✓ | Marks the node as unschedulable _and_ evicts all pods. | +| [Edit](#managing-and-editing-individual-nodes) | ✓ | ✓ | ✓ | ✓ | Enter a custom name, description, label, or taints for a node. | +| [View API](#viewing-a-node-in-the-rancher-api) | ✓ | ✓ | ✓ | ✓ | View API data. | | [Delete](#deleting-a-node) | ✓ | ✓ | | | Deletes defective nodes from the cluster. | | [Download Keys](#ssh-into-a-node-hosted-by-an-infrastructure-provider) | ✓ | | | | Download SSH key in order to SSH into the node. | | [Node Scaling](#scaling-nodes) | ✓ | | | | Scale the number of nodes in the node pool up or down. | @@ -64,6 +66,8 @@ The following table lists which node options are available for each type of clus [2]: {{}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/custom-nodes/ [3]: {{}}/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/ [4]: {{}}/rancher/v2.x/en/cluster-provisioning/imported-clusters/ +{{% /tab %}} +{{% /tabs %}} ### Nodes Hosted by an Infrastructure Provider @@ -79,9 +83,17 @@ Rancher uses [node templates]({{}}/rancher/v2.x/en/cluster-provisioning Options for managing nodes [hosted by a Kubernetes provider]({{}}/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/) are somewhat limited in Rancher. Rather than using the Rancher UI to make edits such as scaling the number of nodes up or down, edit the cluster directly. -### Imported Nodes +### Registered/Imported Nodes -Although you can deploy workloads to an [imported cluster]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/imported-clusters/) using Rancher, you cannot manage individual cluster nodes. All management of imported cluster nodes must take place outside of Rancher. +{{% tabs %}} +{{% tab "Rancher v2.5" %}} +Although you can deploy workloads to a [registered cluster]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/registered-clusters/) using Rancher, management of individual cluster nodes is limited to the supported options indicated in the [node options table]({{< baseurl >}}/rancher/v2.x/en/cluster-admin/nodes/#cordoning-a-node). All other options to manage registered cluster nodes must take place outside of Rancher. +{{% /tab %}} +{{% tab "Rancher v2.0-v2.4" %}} +Although you can deploy workloads to an [imported cluster]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/imported-clusters/) using Rancher, management of individual cluster nodes is limited to the supported options indicated in the [node options table]({{< baseurl >}}/rancher/v2.x/en/cluster-admin/nodes/#cordoning-a-node). All other options + to manage imported cluster nodes must take place outside of Rancher. +{{% /tab %}} +{{% /tabs %}} # Managing and Editing Individual Nodes