diff --git a/content/rancher/v2.x/en/admin-settings/rbac/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/_index.md index e92a88dacfd..63add288f9b 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/_index.md @@ -5,7 +5,7 @@ aliases: -/rancher/v2.x/en/admin-settings/rbac/ --- -Within Rancher, each person authenticates as a _user_, which is a login that grants you access to Rancher. As mentioned in [Authentication]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/authentication), users can either be local or external. +Within Rancher, each person authenticates as a _user_, which is a login that grants you access to Rancher. As mentioned in [Authentication]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication/), users can either be local or external. After you configure external authentication, the users that display on the **Users** page changes. @@ -196,4 +196,3 @@ Roles can be locked by the following users: - Any user assigned the `Administrator` global permission. - Any user assigned the `Custom Users` permission, along with the `Manage Roles` role. - diff --git a/content/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs/_index.md b/content/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs/_index.md index 6a2d95e72b6..10666693c39 100644 --- a/content/rancher/v2.x/en/catalog-and-charts/adding-custom-catalogs/_index.md +++ b/content/rancher/v2.x/en/catalog-and-charts/adding-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/concepts/catalogs). +>- Recommended: Read [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/). >- Create a GitHub repository to serve as your custom catalog. diff --git a/content/rancher/v2.x/en/catalog-and-charts/customizing-charts/_index.md b/content/rancher/v2.x/en/catalog-and-charts/customizing-charts/_index.md index 2235f847845..a45f4782c06 100644 --- a/content/rancher/v2.x/en/catalog-and-charts/customizing-charts/_index.md +++ b/content/rancher/v2.x/en/catalog-and-charts/customizing-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/concepts/catalogs). +>- Recommended: Read [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts). >- 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). >**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/concepts/catalogs/#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-and-charts/#chart-directory-structure). Rancher requires this directory structure, although `app-readme.md` and `questions.yml` are optional. diff --git a/content/rancher/v2.x/en/catalog-and-charts/enabling-default-catalogs/_index.md b/content/rancher/v2.x/en/catalog-and-charts/enabling-default-catalogs/_index.md index 120168cb5e1..d73ff224f34 100644 --- a/content/rancher/v2.x/en/catalog-and-charts/enabling-default-catalogs/_index.md +++ b/content/rancher/v2.x/en/catalog-and-charts/enabling-default-catalogs/_index.md @@ -8,7 +8,7 @@ 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/concepts/catalogs/#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-and-charts/#catalog-types) are: - **Library** - **Helm Stable** diff --git a/content/rancher/v2.x/en/catalog-and-charts/launching-catalog-apps/_index.md b/content/rancher/v2.x/en/catalog-and-charts/launching-catalog-apps/_index.md index 4e90666473c..22c093ae00c 100644 --- a/content/rancher/v2.x/en/catalog-and-charts/launching-catalog-apps/_index.md +++ b/content/rancher/v2.x/en/catalog-and-charts/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/concepts/catalogs). +>**Prerequisite:** Enable a catalog. For more information, see [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/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 80f8378f309..95358fef4d0 100644 --- a/content/rancher/v2.x/en/cli/_index.md +++ b/content/rancher/v2.x/en/cli/_index.md @@ -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/concepts/projects/) 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-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** ``` @@ -56,11 +56,11 @@ The following commands are available for use in Rancher CLI. - `apps, [app]` - Performs operations on catalog applications (i.e. individual [Helm charts](https://docs.helm.sh/developing_charts/) or [Rancher charts]({{< baseurl >}}/rancher/v2.x/en/concepts/catalogs/#rancher-chart-structure)). + Performs operations on catalog applications (i.e. individual [Helm charts](https://docs.helm.sh/developing_charts/) or [Rancher charts]({{< baseurl >}}/rancher/v2.x/en/catalogs-and-charts/#rancher-chart-structure)). - `catalog` - Performs operations on [catalogs]({{< baseurl >}}/rancher/v2.x/en/concepts/catalogs). + Performs operations on [catalogs]({{< baseurl >}}/rancher/v2.x/en/catalogs-and-charts/catalogs). - `clusters, [cluster]` @@ -68,11 +68,11 @@ The following commands are available for use in Rancher CLI. - `context` - Switches between Rancher [projects]({{< baseurl >}}/rancher/v2.x/en/concepts/projects). For an example, see [Project Selection](#project-selection). + Switches between Rancher [projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-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/concepts/projects) and [workloads]({{< baseurl >}}/rancher/v2.x/en/concepts/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-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/concepts/projects/#namespaces). + Performs operations on [namespaces]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/#namespaces). - `nodes, [node]` @@ -92,11 +92,11 @@ The following commands are available for use in Rancher CLI. - `projects, [project]` - Performs operations on [projects]({{< baseurl >}}/rancher/v2.x/en/concepts/projects). + Performs operations on [projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/). - `ps` - Displays [workloads]({{< baseurl >}}/rancher/v2.x/en/concepts/workloads) in a project. + Displays [workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads) in a project. - `settings, [setting]` diff --git a/content/rancher/v2.x/en/clusters/cluster-members/_index.md b/content/rancher/v2.x/en/clusters/cluster-members/_index.md index 0317a42c865..28b876fce3a 100644 --- a/content/rancher/v2.x/en/clusters/cluster-members/_index.md +++ b/content/rancher/v2.x/en/clusters/cluster-members/_index.md @@ -31,18 +31,18 @@ Following cluster creation, you can add users as cluster members so that they ca If external authentication is configured: - - Rancher returns users from your [external authentication]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/authentication/) source as you type. + - 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/). - 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. - >**Note:** If you are logged in as a local user, external users do not display in your search results. For more information, see [External Authentication Configuration and Principal Users]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/authentication/#external-authentication-configuration-and-principal-users). + >**Note:** If you are logged in as a local user, external users do not display in your search results. For more information, see [External Authentication Configuration and Principal Users]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication/#external-authentication-configuration-and-principal-users). 4. Assign the user or group **Cluster** roles. - [What are Cluster Roles?]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/#cluster-roles) + [What are Cluster Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#cluster-roles) >**Tip:** For Custom Roles, you can modify the list of individual roles available for assignment. > diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/_index.md index 76b44c580a5..b7ddb0b1364 100644 --- a/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/_index.md +++ b/content/rancher/v2.x/en/clusters/rke-clusters/node-pools/_index.md @@ -18,8 +18,8 @@ For more information on creating node drivers, see [https://github.com/rancher/u >**Prerequisites:** To create, edit, or delete drivers, you need _one_ of the following permissions: > ->- [Administrator Global Permissions]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/#global-permissions) ->- [Custom Global Permissions]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/#custom-global-permissions) with the [Manage Node Drivers]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/#global-permissions-reference) role assigned. +>- [Administrator Global Permissions]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#global-permissions) +>- [Custom Global Permissions]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#custom-global-permissions) with the [Manage Node Drivers]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#global-permissions-reference) role assigned. ## Adding Custom Node Drivers diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/_index.md index 5ffa334dd0d..5e1f7fd5841 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/_index.md @@ -16,6 +16,6 @@ Within the context of a Rancher project or namespace, _resources_ are files and - [Secrets](#secrets) - [Registries](#registries) -Rancher extends the application of the Kubernetes namespace resources listed above to [projects]({{< baseurl >}}/rancher/v2.x/en/concepts/projects/), which are Rancher-specific constructs. In the hierarchy of Rancher objects, projects contain namespaces. Therefore, any resources available within a project are available for all namespaces within that project. +Rancher extends the application of the Kubernetes namespace resources listed above to [projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/), which are Rancher-specific constructs. In the hierarchy of Rancher objects, projects contain namespaces. Therefore, any resources available within a project are available for all namespaces within that project. -Within Kubernetes, certificates, registries, and secrets are all considered [secrets](https://kubernetes.io/docs/concepts/configuration/secret/). Therefore, within a single project or namespace, these resources must have unique names to avoid conflicts. Although secrets are primarily used to carry sensitive information, they have other uses as well. +Within Kubernetes, certificates, registries, and secrets are all considered [secrets](https://kubernetes.io/docs/concepts/configuration/secret/). Therefore, within a single project or namespace, these resources must have unique names to avoid conflicts. Although secrets are primarily used to carry sensitive information, they have other uses as well. 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 92e81039598..39dc5c550cb 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 @@ -13,13 +13,13 @@ Deploy a workload to run an application in one or more containers. 1. Enter a **Name** for the workload. -1. Select a [workload type]({{< baseurl >}}/rancher/v2.x/en/concepts/workloads/). The workload defaults to a scalable deployment, by can change the workload type by clicking **More options.** +1. Select a [workload type]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/). The workload defaults to a scalable deployment, by can change the workload type by clicking **More options.** 1. From the **Docker Image** field, enter the name of the Docker image that you want to deploy to the project. During deployment, Rancher pulls this image from [Docker Hub](https://hub.docker.com/explore/). Enter the name exactly as it appears on Docker Hub. 1. Either select an existing [namespace](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/), or click **Add to a new namespace** and enter a new namespace. -1. Click **Add Port** to enter a port mapping, which enables access to the application inside and outside of the cluster . For more information, see [Services]({{< baseurl >}}/rancher/v2.x/en/concepts/workloads/#services). +1. Click **Add Port** to enter a port mapping, which enables access to the application inside and outside of the cluster . For more information, see [Services]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/#services). 1. Configure the remaining options: