From 47e494d2b0878e136b2252356b5eddf67d64bfd5 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Mon, 16 Jul 2018 16:11:14 -0700 Subject: [PATCH] moving node drivers and links --- .../rke-clusters/node-pools/azure}/_index.md | 4 +++- .../node-pools/digital-ocean}/_index.md | 4 +++- .../rke-clusters/node-pools/ec2}/_index.md | 4 +++- .../rke-clusters/node-pools/node-drivers/_index.md | 4 ---- .../node-pools/node-templates/_index.md | 4 ---- .../rke-clusters/node-pools/vsphere}/_index.md | 4 +++- .../node-pools/vsphere}/globalpermissionfinal.png | Bin .../node-pools/vsphere}/globalpermissionrole.png | Bin .../node-pools/vsphere}/globalpermissionuser.png | Bin .../node-pools/vsphere}/rancherroles1.png | Bin .../node-pools/vsphere}/rancherroles2.png | Bin .../node-pools/vsphere}/rancheruser.png | Bin .../en/concepts/clusters/cloud-providers/_index.md | 4 ++-- .../en/tasks/user-settings/node-templates/_index.md | 5 ----- .../en/tasks/workloads/deploy-workloads/_index.md | 6 +++--- 15 files changed, 17 insertions(+), 22 deletions(-) rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-azure => clusters/rke-clusters/node-pools/azure}/_index.md (90%) rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-digital-ocean => clusters/rke-clusters/node-pools/digital-ocean}/_index.md (90%) rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2 => clusters/rke-clusters/node-pools/ec2}/_index.md (92%) delete mode 100644 content/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-drivers/_index.md delete mode 100644 content/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-templates/_index.md rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-vsphere => clusters/rke-clusters/node-pools/vsphere}/_index.md (95%) rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-vsphere => clusters/rke-clusters/node-pools/vsphere}/globalpermissionfinal.png (100%) rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-vsphere => clusters/rke-clusters/node-pools/vsphere}/globalpermissionrole.png (100%) rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-vsphere => clusters/rke-clusters/node-pools/vsphere}/globalpermissionuser.png (100%) rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-vsphere => clusters/rke-clusters/node-pools/vsphere}/rancherroles1.png (100%) rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-vsphere => clusters/rke-clusters/node-pools/vsphere}/rancherroles2.png (100%) rename content/rancher/v2.x/en/{tasks/clusters/creating-a-cluster/create-cluster-vsphere => clusters/rke-clusters/node-pools/vsphere}/rancheruser.png (100%) delete mode 100644 content/rancher/v2.x/en/tasks/user-settings/node-templates/_index.md diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/azure/_index.md similarity index 90% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure/_index.md rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/azure/_index.md index d44fde15ba9..dfece5159ba 100644 --- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure/_index.md +++ b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/azure/_index.md @@ -1,7 +1,9 @@ --- title: Creating an Azure Cluster shortTitle: Azure -weight: 3300 +weight: 2220 +aliases: + - /rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure/ --- Use {{< product >}} to create a Kubernetes cluster in Azure. diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/digital-ocean/_index.md similarity index 90% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/_index.md rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/digital-ocean/_index.md index f61f0544162..0a5db8ec5eb 100644 --- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/_index.md +++ b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/digital-ocean/_index.md @@ -1,7 +1,9 @@ --- title: Creating a DigitalOcean Clusters shortTitle: DigitalOcean -weight: 3275 +weight: 2215 +aliases: + - /rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/ --- Use {{< product >}} to create a Kubernetes cluster using DigitalOcean. diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/ec2/_index.md similarity index 92% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/_index.md rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/ec2/_index.md index ebda0e25e5a..54bba1dbad9 100644 --- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/_index.md +++ b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/ec2/_index.md @@ -1,7 +1,9 @@ --- title: Creating an Amazon EC2 Cluster shortTitle: Amazon EC2 -weight: 3250 +weight: 2210 +aliases: + - /rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/ --- Use {{< product >}} to create a Kubernetes cluster in Amazon EC2. diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-drivers/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-drivers/_index.md deleted file mode 100644 index f3a808c1d81..00000000000 --- a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-drivers/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Node Drivers -weight: 2206 ---- diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-templates/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-templates/_index.md deleted file mode 100644 index ac6977a5496..00000000000 --- a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-templates/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Node Templates -weight: 2210 ---- diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/_index.md similarity index 95% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/_index.md rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/_index.md index 7dc13b55153..8576632ad4b 100644 --- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/_index.md +++ b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/_index.md @@ -1,7 +1,9 @@ --- title: Creating a vSphere Cluster shortTitle: vSphere -weight: 3375 +weight: 2225 +aliases: + - /rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/ --- Use {{< product >}} to create a Kubernetes cluster in vSphere. diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/globalpermissionfinal.png b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionfinal.png similarity index 100% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/globalpermissionfinal.png rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionfinal.png diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/globalpermissionrole.png b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionrole.png similarity index 100% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/globalpermissionrole.png rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionrole.png diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/globalpermissionuser.png b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionuser.png similarity index 100% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/globalpermissionuser.png rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionuser.png diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/rancherroles1.png b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancherroles1.png similarity index 100% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/rancherroles1.png rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancherroles1.png diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/rancherroles2.png b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancherroles2.png similarity index 100% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/rancherroles2.png rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancherroles2.png diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/rancheruser.png b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancheruser.png similarity index 100% rename from content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/rancheruser.png rename to content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancheruser.png diff --git a/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md b/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md index b894e2d1f13..9846fe7feed 100644 --- a/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md +++ b/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md @@ -25,7 +25,7 @@ When using the `Amazon` cloud provider, you can leverage the following capabilit - Create/configure an IAM role - Configuring the ClusterID -> **Note:** When you create an [Amazon EC2 Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/#create-the-amazon-ec2-cluster), the `ClusterID` is automatically configured. +> **Note:** When you create an [Amazon EC2 Cluster]({{< baseurl >}}/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-drivers/ec2/#create-the-amazon-ec2-cluster), the `ClusterID` is automatically configured. #### Create/Configure an IAM Role @@ -33,7 +33,7 @@ All nodes added to the cluster must be able to interact with EC2 so that they ca [EC2 documentation: Creating an IAM Role](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html#create-iam-role) -- While creating an [Amazon EC2 cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/#create-the-amazon-ec2-cluster), you must insert the name of the IAM role when creating the **Node Template**. +- While creating an [Amazon EC2 cluster]({{< baseurl >}}/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-drivers/ec2/#create-the-amazon-ec2-cluster), you must insert the name of the IAM role when creating the **Node Template**. - While creating a [Custom cluster]({{< baseurl >}}/rancher/v2.x/en/clusters/custom-clusters/), you must manually attach the IAM role to the instance(s). The following IAM role can be created: diff --git a/content/rancher/v2.x/en/tasks/user-settings/node-templates/_index.md b/content/rancher/v2.x/en/tasks/user-settings/node-templates/_index.md deleted file mode 100644 index 08747161c85..00000000000 --- a/content/rancher/v2.x/en/tasks/user-settings/node-templates/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Managing Node Templates -weight: 3727 -draft: true ---- diff --git a/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md b/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md index 05c50f2d412..7cad05bba1a 100644 --- a/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md +++ b/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md @@ -26,7 +26,7 @@ Deploy a workload to run an application in one or more containers. Use this section to either specify environment variables for your workload to consume on the fly, or to pull them from another source, such as a secret or [ConfigMap]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-configmaps/). - **Node Scheduling** - - **Health Check** + - **Health Check** - **Volumes** Use this section to add storage for your workload. You can manually specify the volume that you want to add, use a persistent volume claim to dynamically create a volume for the workload, or read data for a volume to use from a file such as a [ConfigMap]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-configmaps/). @@ -39,7 +39,7 @@ Deploy a workload to run an application in one or more containers. > >- In [Amazon AWS](https://aws.amazon.com/), the nodes must be in the same Availability Zone and possess IAM permissions to attach/unattach volumes. > - >- The cluster must be using the [AWS cloud provider](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#aws) option. For more information on enabling this option see [Creating an Amazon EC2 Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/) or [Creating a Custom Cluster]({{< baseurl >}}/rancher/v2.x/en/clusters/custom-clusters/). + >- The cluster must be using the [AWS cloud provider](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#aws) option. For more information on enabling this option see [Creating an Amazon EC2 Cluster]({{< baseurl >}}/rancher/v2.x/en/clusters/rke-clusters/node-pools/node-drivers/ec2/) or [Creating a Custom Cluster]({{< baseurl >}}/rancher/v2.x/en/clusters/custom-clusters/). 1. Click **Show Advanced Options** and configure: @@ -51,4 +51,4 @@ Deploy a workload to run an application in one or more containers. 1. Click **Launch**. -**Result:** The workload is deployed to the chosen namespace. You can view the workload's status from the project's **Workloads** view. \ No newline at end of file +**Result:** The workload is deployed to the chosen namespace. You can view the workload's status from the project's **Workloads** view.