From 201e0f9e01c5d1d942faebb2d727883717943228 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Tue, 17 Jul 2018 10:59:35 -0700 Subject: [PATCH] renaming folders --- .../{configuring-ad => ad}/_index.md | 0 .../{configuring-azure-ad => azure-ad}/_index.md | 0 .../{configuring-freeipa => freeipa}/_index.md | 0 .../{configuring-github => github}/_index.md | 0 .../_index.md | 0 .../{configuring-openldap => openldap}/_index.md | 0 .../pod-security-policies/_index.md | 4 ++-- .../{rancher-server-url => server-url}/_index.md | 0 .../en/{catalog-and-charts => catalog}/_index.md | 10 +++++----- .../custom-catalogs}/_index.md | 4 ++-- .../custom-charts}/_index.md | 8 ++++---- .../enabling-default-catalogs/_index.md | 6 +++--- .../launching-catalog-apps/_index.md | 2 +- content/rancher/v2.x/en/cli/_index.md | 14 +++++++------- .../{clusters => cluster-provisioning}/_index.md | 0 .../cluster-members/_index.md | 4 ++-- .../custom-clusters/_index.md | 0 .../hosted-kubernetes-clusters/_index.md | 0 .../hosted-kubernetes-clusters/aks/_index.md | 0 .../hosted-kubernetes-clusters/eks/_index.md | 0 .../hosted-kubernetes-clusters/gke/_index.md | 0 .../imported-clusters/_index.md | 0 .../rke-clusters/_index.md | 0 .../rke-clusters/custom-nodes/_index.md | 0 .../rke-clusters/node-pools/_index.md | 0 .../rke-clusters/node-pools/azure/_index.md | 0 .../node-pools/digital-ocean/_index.md | 0 .../rke-clusters/node-pools/ec2/_index.md | 0 .../rke-clusters/node-pools/vsphere/_index.md | 0 .../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 .../rke-clusters/options/_index.md | 0 .../options/cloud-providers/_index.md | 6 +++--- .../options/pod-security-policies/_index.md | 0 content/rancher/v2.x/en/faq/technical/_index.md | 2 +- .../_index.md | 0 .../creating-and-managing-projects/_index.md | 0 .../project-members/_index.md | 4 ++-- .../workloads/deploy-workloads/_index.md | 2 +- 43 files changed, 33 insertions(+), 33 deletions(-) rename content/rancher/v2.x/en/admin-settings/authentication/{configuring-ad => ad}/_index.md (100%) rename content/rancher/v2.x/en/admin-settings/authentication/{configuring-azure-ad => azure-ad}/_index.md (100%) rename content/rancher/v2.x/en/admin-settings/authentication/{configuring-freeipa => freeipa}/_index.md (100%) rename content/rancher/v2.x/en/admin-settings/authentication/{configuring-github => github}/_index.md (100%) rename content/rancher/v2.x/en/admin-settings/authentication/{configuring-local-authentication => local}/_index.md (100%) rename content/rancher/v2.x/en/admin-settings/authentication/{configuring-openldap => openldap}/_index.md (100%) rename content/rancher/v2.x/en/admin-settings/{rancher-server-url => server-url}/_index.md (100%) rename content/rancher/v2.x/en/{catalog-and-charts => catalog}/_index.md (96%) rename content/rancher/v2.x/en/{catalog-and-charts/adding-custom-catalogs => catalog/custom-catalogs}/_index.md (91%) rename content/rancher/v2.x/en/{catalog-and-charts/customizing-charts => catalog/custom-charts}/_index.md (96%) rename content/rancher/v2.x/en/{catalog-and-charts => catalog}/enabling-default-catalogs/_index.md (82%) rename content/rancher/v2.x/en/{catalog-and-charts => catalog}/launching-catalog-apps/_index.md (94%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/cluster-members/_index.md (94%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/custom-clusters/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/hosted-kubernetes-clusters/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/hosted-kubernetes-clusters/aks/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/hosted-kubernetes-clusters/eks/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/hosted-kubernetes-clusters/gke/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/imported-clusters/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/custom-nodes/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/azure/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/digital-ocean/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/ec2/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/vsphere/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/vsphere/globalpermissionfinal.png (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/vsphere/globalpermissionrole.png (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/vsphere/globalpermissionuser.png (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/vsphere/rancherroles1.png (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/vsphere/rancherroles2.png (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/node-pools/vsphere/rancheruser.png (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/options/_index.md (100%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/options/cloud-providers/_index.md (93%) rename content/rancher/v2.x/en/{clusters => cluster-provisioning}/rke-clusters/options/pod-security-policies/_index.md (100%) rename content/rancher/v2.x/en/kubernetes-in-rancher/{projects-namespaces => projects-and-namespaces}/_index.md (100%) rename content/rancher/v2.x/en/kubernetes-in-rancher/{projects-namespaces => projects-and-namespaces}/creating-and-managing-projects/_index.md (100%) rename content/rancher/v2.x/en/kubernetes-in-rancher/{projects-namespaces => projects-and-namespaces}/project-members/_index.md (94%) diff --git a/content/rancher/v2.x/en/admin-settings/authentication/configuring-ad/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/ad/_index.md similarity index 100% rename from content/rancher/v2.x/en/admin-settings/authentication/configuring-ad/_index.md rename to content/rancher/v2.x/en/admin-settings/authentication/ad/_index.md diff --git a/content/rancher/v2.x/en/admin-settings/authentication/configuring-azure-ad/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/azure-ad/_index.md similarity index 100% rename from content/rancher/v2.x/en/admin-settings/authentication/configuring-azure-ad/_index.md rename to content/rancher/v2.x/en/admin-settings/authentication/azure-ad/_index.md diff --git a/content/rancher/v2.x/en/admin-settings/authentication/configuring-freeipa/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/freeipa/_index.md similarity index 100% rename from content/rancher/v2.x/en/admin-settings/authentication/configuring-freeipa/_index.md rename to content/rancher/v2.x/en/admin-settings/authentication/freeipa/_index.md diff --git a/content/rancher/v2.x/en/admin-settings/authentication/configuring-github/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/github/_index.md similarity index 100% rename from content/rancher/v2.x/en/admin-settings/authentication/configuring-github/_index.md rename to content/rancher/v2.x/en/admin-settings/authentication/github/_index.md diff --git a/content/rancher/v2.x/en/admin-settings/authentication/configuring-local-authentication/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/local/_index.md similarity index 100% rename from content/rancher/v2.x/en/admin-settings/authentication/configuring-local-authentication/_index.md rename to content/rancher/v2.x/en/admin-settings/authentication/local/_index.md diff --git a/content/rancher/v2.x/en/admin-settings/authentication/configuring-openldap/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/openldap/_index.md similarity index 100% rename from content/rancher/v2.x/en/admin-settings/authentication/configuring-openldap/_index.md rename to content/rancher/v2.x/en/admin-settings/authentication/openldap/_index.md diff --git a/content/rancher/v2.x/en/admin-settings/pod-security-policies/_index.md b/content/rancher/v2.x/en/admin-settings/pod-security-policies/_index.md index b2aa12204c4..cf1832e5ac6 100644 --- a/content/rancher/v2.x/en/admin-settings/pod-security-policies/_index.md +++ b/content/rancher/v2.x/en/admin-settings/pod-security-policies/_index.md @@ -55,8 +55,8 @@ You can add a Pod Security Policy (PSPs hereafter) in the following contexts: - [When creating a cluster]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/#adding-a-default-pod-security-policy) - [When editing an existing cluster]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/#adding-a-pod-security-policy) -- [When creating a project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/creating-and-managing-projects/) -- [When editing an existing project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/creating-and-managing-projects/#editing-the-pod-security-policy) +- [When creating a project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/creating-and-managing-projects/) +- [When editing an existing project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/creating-and-managing-projects/#editing-the-pod-security-policy) > **Note:** We recommend adding PSPs during cluster and project creation instead of adding it to an existing one. diff --git a/content/rancher/v2.x/en/admin-settings/rancher-server-url/_index.md b/content/rancher/v2.x/en/admin-settings/server-url/_index.md similarity index 100% rename from content/rancher/v2.x/en/admin-settings/rancher-server-url/_index.md rename to content/rancher/v2.x/en/admin-settings/server-url/_index.md diff --git a/content/rancher/v2.x/en/catalog-and-charts/_index.md b/content/rancher/v2.x/en/catalog/_index.md similarity index 96% rename from content/rancher/v2.x/en/catalog-and-charts/_index.md rename to content/rancher/v2.x/en/catalog/_index.md index 4c71d9eeb3d..1d701ea643d 100644 --- a/content/rancher/v2.x/en/catalog-and-charts/_index.md +++ b/content/rancher/v2.x/en/catalog/_index.md @@ -8,9 +8,9 @@ aliases: This section includes step-by-step instruction on how to configure default and custom catalogs. -- [Enabling Default Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/enabling-default-catalogs) -- [Adding Custom Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs) -- [Customizing Charts]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/customizing-charts) +- [Enabling Default Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog/enabling-default-catalog/) +- [Adding Custom Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog/custom-catalogs/) +- [Customizing Charts]({{< baseurl >}}/rancher/v2.x/en/catalog/custom-charts/) _Catalogs_ are GitHub repositories filled with applications that are ready-made for deployment. Applications are bundled in objects called _charts_. @@ -52,7 +52,7 @@ Custom catalog requirements include: - A unique name. - A URL that `git clone` can handle. -For step-by-step directions, see [Adding Custom Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs). +For step-by-step directions, see [Adding Custom Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog/custom-catalogs/). When you're done creating the catalog, populate it with charts. Custom catalogs can support both native Helm charts and Rancher charts. See [Custom Chart Creation](#custom-chart-creation). @@ -163,6 +163,6 @@ Before you create your own custom catalog, you should have a basic understanding You can fill your custom catalogs with either Helm Charts or Rancher Charts, although we recommend Rancher Charts due to their enhanced user experience. - For information on how to add and customize charts for a custom catalog, see [Customizing Charts]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/customizing-charts). + For information on how to add and customize charts for a custom catalog, see [Customizing Charts]({{< baseurl >}}/rancher/v2.x/en/catalog/custom-charts/). >**Note:** For a complete walkthrough of developing charts, see the upstream Helm chart [developer reference](https://docs.helm.sh/developing_charts/). diff --git a/content/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs/_index.md b/content/rancher/v2.x/en/catalog/custom-catalogs/_index.md similarity index 91% rename from content/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs/_index.md rename to content/rancher/v2.x/en/catalog/custom-catalogs/_index.md index 10666693c39..cb69a270ffb 100644 --- a/content/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs/_index.md +++ b/content/rancher/v2.x/en/catalog/custom-catalogs/_index.md @@ -17,7 +17,7 @@ You can create custom catalogs of charts for use in Rancher. Custom catalogs are >**Prerequisites:** > ->- Recommended: Read [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/). +>- Recommended: Read [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog/). >- Create a GitHub repository to serve as your custom catalog. @@ -29,4 +29,4 @@ You can create custom catalogs of charts for use in Rancher. Custom catalogs are ## What's Next? -Add native Helm charts, Rancher charts, or both to your repository. For more information, see [Customizing Charts]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/customizing-charts/). +Add native Helm charts, Rancher charts, or both to your repository. For more information, see [Customizing Charts]({{< baseurl >}}/rancher/v2.x/en/catalog/custom-charts/). diff --git a/content/rancher/v2.x/en/catalog-and-charts/customizing-charts/_index.md b/content/rancher/v2.x/en/catalog/custom-charts/_index.md similarity index 96% rename from content/rancher/v2.x/en/catalog-and-charts/customizing-charts/_index.md rename to content/rancher/v2.x/en/catalog/custom-charts/_index.md index a45f4782c06..bf1fb9bfcc2 100644 --- a/content/rancher/v2.x/en/catalog-and-charts/customizing-charts/_index.md +++ b/content/rancher/v2.x/en/catalog/custom-charts/_index.md @@ -11,13 +11,13 @@ The custom catalog can contain native Helm charts, Rancher charts, or a combinat >**Prerequisites:** ->- Recommended: Read [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts). +>- Recommended: Read [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog). >- Create a GitHub repository to serve as your custom catalog. ->- Complete [Adding Custom Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs). +>- Complete [Adding Custom Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog/custom-catalogs/). >**Note:** Customization of Helm charts takes place outside of the Rancher UI. -1. Within the GitHub repo that you're using as your custom catalog, create a directory structure that mirrors the structure listed in [Chart Directory Structure]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/#chart-directory-structure). +1. Within the GitHub repo that you're using as your custom catalog, create a directory structure that mirrors the structure listed in [Chart Directory Structure]({{< baseurl >}}/rancher/v2.x/en/catalog/#chart-directory-structure). Rancher requires this directory structure, although `app-readme.md` and `questions.yml` are optional. @@ -81,7 +81,7 @@ The custom catalog can contain native Helm charts, Rancher charts, or a combinat ## What's Next? -Launch your custom catalog app. For more information, see [Launching a Catalog App]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/launching-catalog-apps/). +Launch your custom catalog app. For more information, see [Launching a Catalog App]({{< baseurl >}}/rancher/v2.x/en/catalog/launching-catalog-apps/). ## Question Variable Reference diff --git a/content/rancher/v2.x/en/catalog-and-charts/enabling-default-catalogs/_index.md b/content/rancher/v2.x/en/catalog/enabling-default-catalogs/_index.md similarity index 82% rename from content/rancher/v2.x/en/catalog-and-charts/enabling-default-catalogs/_index.md rename to content/rancher/v2.x/en/catalog/enabling-default-catalogs/_index.md index d73ff224f34..b3b66772e7f 100644 --- a/content/rancher/v2.x/en/catalog-and-charts/enabling-default-catalogs/_index.md +++ b/content/rancher/v2.x/en/catalog/enabling-default-catalogs/_index.md @@ -8,16 +8,16 @@ aliases: Out-of-the-box, you can enable several different catalog repositories to simplify deployment of applications. 1. From the **Global** view, choose **Catalogs** from the main menu. -2. Toggle the default catalogs that you want use to a setting of **Enabled**. The [default catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/#catalog-types) are: +2. Toggle the default catalogs that you want use to a setting of **Enabled**. The [default catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog/#catalog-types) are: - **Library** - **Helm Stable** - **Helm Incubator** - >**Note:** If you want to use a custom catalog, see [Adding Custom Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs) instead of this topic. + >**Note:** If you want to use a custom catalog, see [Adding Custom Catalogs]({{< baseurl >}}/rancher/v2.x/en/catalog/custom-catalogs/) instead of this topic. **Result:** The chosen catalogs are enabled. Wait a few minutes for Rancher to replicate the catalog charts. When replication completes, you'll be able to see them in any of your projects by selecting **Catalog Apps** from the main menu. ## What's Next? -Deploy catalog applications to your cluster nodes. For more information, see [Launching a Catalog App]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/launching-catalog-apps). +Deploy catalog applications to your cluster nodes. For more information, see [Launching a Catalog App]({{< baseurl >}}/rancher/v2.x/en/catalog/launching-catalog-apps). diff --git a/content/rancher/v2.x/en/catalog-and-charts/launching-catalog-apps/_index.md b/content/rancher/v2.x/en/catalog/launching-catalog-apps/_index.md similarity index 94% rename from content/rancher/v2.x/en/catalog-and-charts/launching-catalog-apps/_index.md rename to content/rancher/v2.x/en/catalog/launching-catalog-apps/_index.md index 22c093ae00c..d6c5218eca1 100644 --- a/content/rancher/v2.x/en/catalog-and-charts/launching-catalog-apps/_index.md +++ b/content/rancher/v2.x/en/catalog/launching-catalog-apps/_index.md @@ -5,7 +5,7 @@ weight: 4010 After you've enabled default catalogs or setup a custom catalog, you can launch apps using a catalog instead of a standard deployment. ->**Prerequisite:** Enable a catalog. For more information, see [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/catalogs). +>**Prerequisite:** Enable a catalog. For more information, see [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog/catalogs). 1. From the **Global** view, open the project that you want to deploy to. diff --git a/content/rancher/v2.x/en/cli/_index.md b/content/rancher/v2.x/en/cli/_index.md index 95358fef4d0..06a610e32de 100644 --- a/content/rancher/v2.x/en/cli/_index.md +++ b/content/rancher/v2.x/en/cli/_index.md @@ -15,7 +15,7 @@ The binary can be downloaded directly from the UI. The link can be found in the After you download the Rancher CLI, you need to make a few configurations. Rancher CLI requires: -- Your [Rancher Server URL]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rancher-server-url), which is used to connect to Rancher Server. +- Your [Rancher Server URL]({{< baseurl >}}/rancher/v2.x/en/admin-settings/server-url), which is used to connect to Rancher Server. - An API Bearer Token, which is used to authenticate with Rancher. For more information about obtaining a Bearer Token, see [Creating an API Key]({{< baseurl >}}/rancher/v2.x/en/user-settings/api-keys/). ### CLI Authentication @@ -30,7 +30,7 @@ If Rancher Server uses a self-signed certificate, Rancher CLI prompts you to con ### Project Selection -Before you can perform any commands, you must select a Rancher project to perform those commands against. To select a [project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/) to work on, use the command `./rancher context switch`. When you enter this command, a list of available projects displays. Enter a number to choose your project. +Before you can perform any commands, you must select a Rancher project to perform those commands against. To select a [project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/) to work on, use the command `./rancher context switch`. When you enter this command, a list of available projects displays. Enter a number to choose your project. **Example: `./rancher context switch` Output** ``` @@ -64,15 +64,15 @@ The following commands are available for use in Rancher CLI. - `clusters, [cluster]` - Performs operations on your [clusters]({{< baseurl >}}/rancher/v2.x/en/clusters/). + Performs operations on your [clusters]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/). - `context` - Switches between Rancher [projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces). For an example, see [Project Selection](#project-selection). + Switches between Rancher [projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/). For an example, see [Project Selection](#project-selection). - `inspect [OPTIONS] [RESOURCEID RESOURCENAME]` - Displays details about [Kubernetes resources](https://kubernetes.io/docs/reference/kubectl/cheatsheet/#resource-types) or Rancher resources (i.e.: [projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/) and [workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/)). Specify resources by name or ID. + Displays details about [Kubernetes resources](https://kubernetes.io/docs/reference/kubectl/cheatsheet/#resource-types) or Rancher resources (i.e.: [projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/) and [workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/)). Specify resources by name or ID. - `kubectl` @@ -84,7 +84,7 @@ The following commands are available for use in Rancher CLI. - `namespaces, [namespace]` - Performs operations on [namespaces]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/#namespaces). + Performs operations on [namespaces]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/#namespaces). - `nodes, [node]` @@ -92,7 +92,7 @@ The following commands are available for use in Rancher CLI. - `projects, [project]` - Performs operations on [projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/). + Performs operations on [projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/). - `ps` diff --git a/content/rancher/v2.x/en/clusters/_index.md b/content/rancher/v2.x/en/cluster-provisioning/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/_index.md diff --git a/content/rancher/v2.x/en/clusters/cluster-members/_index.md b/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md similarity index 94% rename from content/rancher/v2.x/en/clusters/cluster-members/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md index 28b876fce3a..7e54af5d97f 100644 --- a/content/rancher/v2.x/en/clusters/cluster-members/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md @@ -7,7 +7,7 @@ aliases: If you want to provide a user with access and permissions to _all_ projects, nodes, and resources within a cluster, assign the user a cluster membership. ->**Tip:** Want to provide a user with access to a _specific_ project within a cluster? See [Adding Project Members]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/project-members/) instead. +>**Tip:** Want to provide a user with access to a _specific_ project within a cluster? See [Adding Project Members]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/) instead. There are two contexts where you can add cluster members: @@ -34,7 +34,7 @@ Following cluster creation, you can add users as cluster members so that they ca - Rancher returns users from your [external authentication]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication/) source as you type. >**Using AD but can't find your users?** - >There may be an issue with your search attribute configuration. See [Configuring Active Directory Authentication: Step 5]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication/configuring-ad/). + >There may be an issue with your search attribute configuration. See [Configuring Active Directory Authentication: Step 5]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication/ad/). - A drop-down allows you to add groups instead of individual users. The drop-down only lists groups that you, the logged in user, are part of. diff --git a/content/rancher/v2.x/en/clusters/custom-clusters/_index.md b/content/rancher/v2.x/en/cluster-provisioning/custom-clusters/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/custom-clusters/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/custom-clusters/_index.md diff --git a/content/rancher/v2.x/en/clusters/hosted-kubernetes-clusters/_index.md b/content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/hosted-kubernetes-clusters/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/_index.md diff --git a/content/rancher/v2.x/en/clusters/hosted-kubernetes-clusters/aks/_index.md b/content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/hosted-kubernetes-clusters/aks/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/aks/_index.md diff --git a/content/rancher/v2.x/en/clusters/hosted-kubernetes-clusters/eks/_index.md b/content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/hosted-kubernetes-clusters/eks/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md diff --git a/content/rancher/v2.x/en/clusters/hosted-kubernetes-clusters/gke/_index.md b/content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/gke/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/hosted-kubernetes-clusters/gke/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/gke/_index.md diff --git a/content/rancher/v2.x/en/clusters/imported-clusters/_index.md b/content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/imported-clusters/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/custom-nodes/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/custom-nodes/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/custom-nodes/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/custom-nodes/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/azure/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/azure/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/azure/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/azure/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/digital-ocean/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/digital-ocean/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/digital-ocean/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/digital-ocean/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/ec2/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/ec2/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/ec2/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/ec2/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionfinal.png b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/globalpermissionfinal.png similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionfinal.png rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/globalpermissionfinal.png diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionrole.png b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/globalpermissionrole.png similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionrole.png rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/globalpermissionrole.png diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionuser.png b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/globalpermissionuser.png similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/globalpermissionuser.png rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/globalpermissionuser.png diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancherroles1.png b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/rancherroles1.png similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancherroles1.png rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/rancherroles1.png diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancherroles2.png b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/rancherroles2.png similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancherroles2.png rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/rancherroles2.png diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancheruser.png b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/rancheruser.png similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/node-pools/vsphere/rancheruser.png rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/rancheruser.png diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/options/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/options/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/options/cloud-providers/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/cloud-providers/_index.md similarity index 93% rename from content/rancher/v2.x/en/clusters/rke-clusters/options/cloud-providers/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/cloud-providers/_index.md index 49d06cabba7..78f58542bc9 100644 --- a/content/rancher/v2.x/en/clusters/rke-clusters/options/cloud-providers/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/cloud-providers/_index.md @@ -27,7 +27,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/clusters/rke-clusters/node-pools/ec2/#create-the-amazon-ec2-cluster), the `ClusterID` is automatically configured. +> **Note:** When you create an [Amazon EC2 Cluster]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/ec2/#create-the-amazon-ec2-cluster), the `ClusterID` is automatically configured. #### Create/Configure an IAM Role @@ -35,8 +35,8 @@ 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/clusters/rke-clusters/node-pools/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). +- While creating an [Amazon EC2 cluster]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/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/cluster-provisioning/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/clusters/rke-clusters/options/pod-security-policies/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/pod-security-policies/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md rename to content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/pod-security-policies/_index.md diff --git a/content/rancher/v2.x/en/faq/technical/_index.md b/content/rancher/v2.x/en/faq/technical/_index.md index 75066217459..a21cdc71955 100644 --- a/content/rancher/v2.x/en/faq/technical/_index.md +++ b/content/rancher/v2.x/en/faq/technical/_index.md @@ -64,7 +64,7 @@ Node Templates can be accessed by opening your account menu (top right) and sele ### Why is my Layer-4 Load Balancer in `Pending` state? -The Layer-4 Load Balancer is created as `type: LoadBalancer`. In Kubernetes, this needs a cloud provider or controller that can satisfy these requests, otherwise these will be in `Pending` state forever. More information can be found on [Cloud Providers]({{< baseurl >}}/rancher/v2.x/en/clusters/rke-clusters/options/cloud-providers/) or [Create External Load Balancer](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/) +The Layer-4 Load Balancer is created as `type: LoadBalancer`. In Kubernetes, this needs a cloud provider or controller that can satisfy these requests, otherwise these will be in `Pending` state forever. More information can be found on [Cloud Providers]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/cloud-providers/) or [Create External Load Balancer](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/) ### Where is the state of Rancher stored? diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/_index.md similarity index 100% rename from content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/_index.md diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/creating-and-managing-projects/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/creating-and-managing-projects/_index.md similarity index 100% rename from content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/creating-and-managing-projects/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/creating-and-managing-projects/_index.md diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/project-members/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md similarity index 94% rename from content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/project-members/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md index 940e4e2e551..2b638b7acb4 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/project-members/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md @@ -7,11 +7,11 @@ aliases: If you want to provide a user with access and permissions to _specific_ projects and resources within a cluster, assign the user a project membership. ->**Tip:** Want to provide a user with access to _all_ projects within a cluster? See [Adding Cluster Members]({{< baseurl >}}/rancher/v2.x/en/clusters/cluster-members/) instead. +>**Tip:** Want to provide a user with access to _all_ projects within a cluster? See [Adding Cluster Members]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/cluster-members/) instead. There are two contexts where you can add project members: -- [Adding Members to a New Project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/project-members/) +- [Adding Members to a New Project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/) You can add members to a project as you create it (recommended if possible). diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/_index.md index 39dc5c550cb..dacbb0616ed 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/_index.md @@ -41,7 +41,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/clusters/rke-clusters/node-pools/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/cluster-provisioning/rke-clusters/node-pools/ec2/) or [Creating a Custom Cluster]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/custom-clusters/). 1. Click **Show Advanced Options** and configure: