diff --git a/content/rancher/concepts/users-and-roles.md b/content/rancher/concepts/users-and-roles.md index be5042709aa..5e327b599e7 100644 --- a/content/rancher/concepts/users-and-roles.md +++ b/content/rancher/concepts/users-and-roles.md @@ -1,6 +1,6 @@ # Users and Roles -Every user in {{< product >}} is assigned a _role_, which is a set of permissions that determine what Kubenetes API endpoints that the user can access. Let's use this metaphor: a user account is like getting access to an entire office building; however, the user's role determine what rooms the user can access within the building. +Every user in {{< product >}} is assigned a _role_, which is a set of permissions that determine what Kubernetes API endpoints that the user can access. Let's use this metaphor: a user account is like getting access to an entire office building; however, the user's role determine what rooms the user can access within the building. Within {{< product >}} there are two types of user roles: diff --git a/content/rancher/installation/requirements.md b/content/rancher/installation/requirements.md index 21d87dfdd24..ce9d18b4066 100644 --- a/content/rancher/installation/requirements.md +++ b/content/rancher/installation/requirements.md @@ -2,15 +2,18 @@ ## Operating System Requirements -- Operating System: Ubuntu 16.04 (64-bit) +- Ubuntu 16.04 (64-bit) +- Red Hat Enterprise Linux 7.5 (64-bit) +- RancherOS ## Hardware Requirements - Memory: 4GB -## Software Requirements -- Docker +## Software requirements + +- Software: Docker **Supported Versions:** diff --git a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-custom.md b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-custom.md index 7d0da2efb9d..6c1e2f4c76e 100644 --- a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-custom.md +++ b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-custom.md @@ -56,7 +56,9 @@ Use {{< product >}} to clone your Linux host and configure them as Kubernetes no > If you plan on dedicating bare-metal servers to each role, you must provision a bare-metal server for each role (i.e. provision multiple bare-metal servers). -8. **Optional**: Use **Labels** to add metadata so that you can find them later. +8. **Optional**: Add **Labels** to your cluster nodes to help schedule workloads later. + + [Kubernetes Documentation: Labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) 9. Copy the command displayed on screen to your clipboard. diff --git a/content/rancher/tasks/global-configuration/authentication/configure-user-authentication.md b/content/rancher/tasks/global-configuration/authentication/configure-user-authentication.md index 2e7fed216da..2fa88595e20 100644 --- a/content/rancher/tasks/global-configuration/authentication/configure-user-authentication.md +++ b/content/rancher/tasks/global-configuration/authentication/configure-user-authentication.md @@ -1,12 +1,12 @@ # Configuring User Authentication -You have three options for user authentication in {{< product >}}: +You have three options for user authentication in {{< product >}}. We recommend using an external authentication method (i.e. Active Directory or GitHub) rather than local authentication. External authentication reduces upkeep of your users. - **Active Directory**: Enterprises can use Active Directory (AD) for authentication, allowing users to sign in using their corporate credentials. - **GitHub**: Open source projects or organizations that use GitHub for source control may prefer that users sign in using their GitHub accounts. -- **Basic Authentication**: If you don't want to use external authentication, you can always add users directly to {{< product >}}. We recommend using external authentication over basic authentication. +- **Local Authentication**: If you don't want to use external authentication, you can always add users directly to {{< product >}}. We recommend using external authentication over local authentication. ## Configure an Authentication Method @@ -80,7 +80,7 @@ You have three options for user authentication in {{< product >}}: - You are signed into Rancher with your GitHub account. - Your GitHub account is added to Rancher as an administrator. -### To Configure Basic Authentication +### To Configure Local Authentication 1. From the **Global** view, select **Users** from the main menu.