From a927570d3289b4aeef5d3dc3bdf99331b3bff73c Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 1 Nov 2018 19:24:46 -0700 Subject: [PATCH] changing use of 'node pools' to 'infrastructure provider' --- content/rancher/v2.x/en/cluster-provisioning/_index.md | 9 ++++----- .../v2.x/en/cluster-provisioning/rke-clusters/_index.md | 4 ++-- .../rke-clusters/node-pools/_index.md | 2 +- content/rancher/v2.x/en/k8s-in-rancher/nodes/_index.md | 6 +++--- .../v2.x/en/user-settings/node-templates/_index.md | 2 +- .../en/config-options/cloud-providers/vsphere/_index.md | 8 ++++---- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/content/rancher/v2.x/en/cluster-provisioning/_index.md b/content/rancher/v2.x/en/cluster-provisioning/_index.md index 808214f97e8..318cf361898 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/_index.md @@ -51,8 +51,7 @@ Options include: - [Hosted Kubernetes Cluster](#hosted-kubernetes-cluster) - [Rancher Launched Kubernetes](#rancher-launched-kubernetes) - - - [Node Pools](#node-pools) + - [Nodes Hosted by an Infrastructure Provider](#nodes-hosted-by-an-infrastructure-provider) - [Custom Nodes](#custom-nodes) - [Import Existing Cluster](#import-existing-cluster) @@ -73,11 +72,11 @@ Alternatively, you can use Rancher to create a cluster on your own nodes, using [Rancher Launched Kubernetes]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/) -#### Node Pools +#### Nodes Hosted by an Infrastructure Provider -Using Rancher, you can create pools of nodes based on a [node template]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-templates). This template defines the parameters used to launch nodes in your cloud providers. The cloud providers available for creating a node template are decided based on the [node drivers]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-drivers) active in the Rancher UI. The benefit of using a node pool is that if a node loses connectivity with the cluster, Rancher automatically replaces it, thus maintaining the expected cluster configuration. +Using Rancher, you can create pools of nodes based on a [node template]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-templates). This template defines the parameters used to launch nodes in your cloud providers. The cloud providers available for creating a node template are decided based on the [node drivers]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-drivers) active in the Rancher UI. The benefit of using nodes hosted by an infrastructure provider is that if a node loses connectivity with the cluster, Rancher automatically replaces it, thus maintaining the expected cluster configuration. -[Node Pools]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/) +[Nodes Hosted by an Infrastructure Provider]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/) #### Custom Nodes diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/_index.md index d0388377478..f64297f1e8e 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/_index.md @@ -11,9 +11,9 @@ If you don't want to use a hosted Kubernetes provider, you can have Rancher laun RKE launched clusters are separated into two categories: -- [Node Pools]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/): +- [Nodes Hosted by an Infrastructure Provider]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/): - Using Rancher, you can create pools of nodes based on a [node template]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-templates). This node template defines the parameters you want to use to launch nodes in your cloud providers. The available cloud providers to create a node template are decided based on active [node drivers]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-drivers). The benefit of using a node pool is that if a node loses connectivity with the cluster, Rancher will automatically create another node to join the cluster to ensure that the count of the node pool is as expected. + Using Rancher, you can create pools of nodes based on a [node template]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-templates). This node template defines the parameters you want to use to launch nodes in your cloud providers. The available cloud providers to create a node template are decided based on active [node drivers]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-drivers). The benefit of using a node hosted by an infrastructure provider is that if a node loses connectivity with the cluster, Rancher will automatically create another node to join the cluster to ensure that the count of the node pool is as expected. - [Custom Nodes]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/custom-nodes/): diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/_index.md index 9fbdb7e18a6..3ab3fabc935 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/_index.md @@ -1,5 +1,5 @@ --- -title: Nodes hosted in an Infrastructure Provider +title: Nodes Hosted in an Infrastructure Provider weight: 2205 aliases: - /rancher/v2.x/en/concepts/global-configuration/node-drivers/ diff --git a/content/rancher/v2.x/en/k8s-in-rancher/nodes/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/nodes/_index.md index 1973669206d..32a960e0831 100644 --- a/content/rancher/v2.x/en/k8s-in-rancher/nodes/_index.md +++ b/content/rancher/v2.x/en/k8s-in-rancher/nodes/_index.md @@ -15,7 +15,7 @@ To manage individual nodes, browse to the cluster that you want to manage and th The following table lists which node options are available for each [type of cluster]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/#cluster-creation-options) in Rancher. Click the links in the **Option** column for more detailed information about each feature. -| Option | [Node Pool][1] | [Custom Node][2] | [Hosted Cluster][3] | [Imported Nodes][4] | Description | +| 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. | @@ -106,12 +106,12 @@ For nodes hosted by an infrastructure provider, you can scale the number of node ![Scaling Nodes]({{< baseurl >}}/img/rancher/iaas-scale-nodes.png) -## Remoting into a Node Pool Node +## Remoting into a Node Hosted by an Infrastructure Provider For [nodes hosted by an infrastructure provider]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/), you have the option of downloading its SSH key so that you can connect to it remotely from your desktop. -1. From the Node Pool cluster, select **Nodes** from the main menu. +1. From the cluster hosted by an infrastructure provider, select **Nodes** from the main menu. 1. Find the node that you want to remote into. Select **Ellipsis (...) > Download Keys**. diff --git a/content/rancher/v2.x/en/user-settings/node-templates/_index.md b/content/rancher/v2.x/en/user-settings/node-templates/_index.md index fdc48f6e6b1..24d0d604602 100644 --- a/content/rancher/v2.x/en/user-settings/node-templates/_index.md +++ b/content/rancher/v2.x/en/user-settings/node-templates/_index.md @@ -3,7 +3,7 @@ title: Managing Node Templates weight: 7010 --- -When you provision a [node pool]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools) cluster, [node templates]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-templates) are used to provision the cluster nodes. These templates use Docker Machine configuration options to define an operating system image and settings/parameters for the node. You can create node templates in two contexts: +When you provision a cluster [hosted by an infrastructure provider]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools), [node templates]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/#node-templates) are used to provision the cluster nodes. These templates use Docker Machine configuration options to define an operating system image and settings/parameters for the node. You can create node templates in two contexts: - While [provisioning a node pool cluster]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools). - At any time, from your [user settings](#creating-a-node-template-from-user-settings). diff --git a/content/rke/v0.1.x/en/config-options/cloud-providers/vsphere/_index.md b/content/rke/v0.1.x/en/config-options/cloud-providers/vsphere/_index.md index fdfdddcac7c..9a79826b2df 100644 --- a/content/rke/v0.1.x/en/config-options/cloud-providers/vsphere/_index.md +++ b/content/rke/v0.1.x/en/config-options/cloud-providers/vsphere/_index.md @@ -28,7 +28,7 @@ When provisioning clusters in Rancher using the [vSphere node driver]({{< baseur 5. Assign **Member Roles** as required. 6. Expand **Cluster Options** and configure as required. 7. Set **Cloud Provider** option to `Custom`. - + ![vsphere-node-driver-cloudprovider]({{< baseurl >}}/img/rancher/vsphere-node-driver-cloudprovider.png) 8. Click on **Edit as YAML** @@ -149,7 +149,7 @@ The following configuration options are available under the disk directive: ___ -### network +### network The following configuration options are available under the network directive: @@ -184,7 +184,7 @@ cloud_provider: folder: k8s-dummy default-datastore: ds-1 datacenter: eu-west-1 - + ``` ## Annex @@ -245,7 +245,7 @@ $ rancher ssh ``` 3. Inspect the logs of the controller-manager and kubelet containers looking for errors related to the vSphere cloud provider: - + ```sh $ docker logs --since 15m kube-controller-manager $ docker logs --since 15m kubelet