From f98b557aacf8ff4fa70c9c0b5d437e7c6e8aef3d Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Thu, 7 Jun 2018 20:59:05 -0700 Subject: [PATCH] undraft api-keys and psps --- content/rancher/v2.x/en/concepts/api-keys/_index.md | 1 - .../clusters/adding-a-pod-security-policy/_index.md | 7 +++---- .../v2.x/en/tasks/global-configuration/roles/_index.md | 4 ++-- content/rancher/v2.x/en/tasks/user-settings/_index.md | 10 +++++++++- .../user-settings/{api-key => api-keys}/_index.md | 5 ++--- .../en/tasks/user-settings/node-templates/_index.md | 3 +-- .../v2.x/en/tasks/user-settings/preferences/_index.md | 5 +++++ 7 files changed, 22 insertions(+), 13 deletions(-) rename content/rancher/v2.x/en/tasks/user-settings/{api-key => api-keys}/_index.md (92%) create mode 100644 content/rancher/v2.x/en/tasks/user-settings/preferences/_index.md diff --git a/content/rancher/v2.x/en/concepts/api-keys/_index.md b/content/rancher/v2.x/en/concepts/api-keys/_index.md index 0f09c8a73ac..6ef51c7a192 100644 --- a/content/rancher/v2.x/en/concepts/api-keys/_index.md +++ b/content/rancher/v2.x/en/concepts/api-keys/_index.md @@ -1,7 +1,6 @@ --- title: API Keys weight: 2400 -draft: true --- Some users may want to access their Rancher clusters and projects through the Rancher API. Before you can access Rancher through the API, you must generate API keys so that you can authenticate with Rancher externally. diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md index ad2d8180bd7..96f7b65e3dc 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md @@ -1,7 +1,6 @@ --- title: Adding a Pod Security Policy weight: 3475 -draft: true --- _Pod Security Policies_ are objects that control security-sensitive aspects of pod specification (like root privileges). @@ -13,7 +12,7 @@ You can add a Pod Security Policy (PSPs hereafter) in the following contexts: - [When creating a project](#project-creation--adding-a-pod-security-policy) - [When editing an existing project](#existing-project--adding-a-pod-security-policy) -> **Note:** We recommend adding PSPs during cluster and project creation instead of adding it to an existing one. +> **Note:** We recommend adding PSPs during cluster and project creation instead of adding it to an existing one. For more information about PSPs, refer to [Pod Security Policy]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/pod-security-policies). @@ -23,8 +22,8 @@ When you create a new cluster, you can configure it to apply a PSP immediately. >**Prerequisite:** >Create a Pod Security Policy within Rancher. Before you can assign a default PSP to a new cluster, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/pod-security-policies/). ->**Note:** ->For security purposes, we recommend assiging a PSP as you create your clusters. +>**Note:** +>For security purposes, we recommend assiging a PSP as you create your clusters. To enable a default Pod Security Policy, set the **Pod Security Policy Support** option to **Enabled**, and then make a selection from the **Default Pod Security Policy** drop-down. diff --git a/content/rancher/v2.x/en/tasks/global-configuration/roles/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/roles/_index.md index 4fcb840b2e6..3766ed5d4ad 100644 --- a/content/rancher/v2.x/en/tasks/global-configuration/roles/_index.md +++ b/content/rancher/v2.x/en/tasks/global-configuration/roles/_index.md @@ -51,7 +51,7 @@ While Rancher comes out-of-the-box with a set of default user roles, you can als ## Locking/Unlocking Roles -If you want to prevent a role from being assigned to users, you can set it to a status of `locked`. For more information about what this status means, see [Locked Roles]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/#locked-roles). +If you want to prevent a role from being assigned to users, you can set it to a status of `locked`. For more information about what this status means, see [Locked Roles]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/#locked-roles). You can lock roles in two contexts: @@ -63,4 +63,4 @@ You can lock roles in two contexts: 2. From the role that you want to lock (or unlock), select **Vertical Ellipsis (...)** > **Edit**. -3. From the **Locked** option, choose the **Yes** or **No** radio button. Then click **Save**. \ No newline at end of file +3. From the **Locked** option, choose the **Yes** or **No** radio button. Then click **Save**. diff --git a/content/rancher/v2.x/en/tasks/user-settings/_index.md b/content/rancher/v2.x/en/tasks/user-settings/_index.md index e9c127b9fdd..0e9aced3202 100644 --- a/content/rancher/v2.x/en/tasks/user-settings/_index.md +++ b/content/rancher/v2.x/en/tasks/user-settings/_index.md @@ -3,4 +3,12 @@ title: User Settings weight: 3725 --- -Within Rancher, each user has a number of settings associated with their login: personal preferences, API keys, etc. You can configure these settings by choosing from the **User Settings** menu. You can open this menu by clicking your avatar, located within the main menu. \ No newline at end of file +Within Rancher, each user has a number of settings associated with their login: personal preferences, API keys, etc. You can configure these settings by choosing from the **User Settings** menu. You can open this menu by clicking your avatar, located within the main menu. + +The available user settings are: + +- [API & Keys]({{< baseurl >}}/rancher/v2.x/en/tasks/user-settings/api-keys/)) + +- Node Templates + +- Preferences diff --git a/content/rancher/v2.x/en/tasks/user-settings/api-key/_index.md b/content/rancher/v2.x/en/tasks/user-settings/api-keys/_index.md similarity index 92% rename from content/rancher/v2.x/en/tasks/user-settings/api-key/_index.md rename to content/rancher/v2.x/en/tasks/user-settings/api-keys/_index.md index c1883de49d0..70a26c84956 100644 --- a/content/rancher/v2.x/en/tasks/user-settings/api-key/_index.md +++ b/content/rancher/v2.x/en/tasks/user-settings/api-keys/_index.md @@ -1,7 +1,6 @@ --- title: Creating an API Key -weight: 3725 -draft: true +weight: 3726 --- Create a Rancher API key so that other applications can make requests to the Rancher API. You can create API keys using the Rancher UI. @@ -29,4 +28,4 @@ You should delete API keys: - That may have been compromised. - That have expired. -To delete an API, select the stale key and click **Delete**. \ No newline at end of file +To delete an API, select the stale key and click **Delete**. 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 index 5feebac55ad..08747161c85 100644 --- 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 @@ -1,6 +1,5 @@ --- title: Managing Node Templates -weight: 3725 +weight: 3727 draft: true --- - diff --git a/content/rancher/v2.x/en/tasks/user-settings/preferences/_index.md b/content/rancher/v2.x/en/tasks/user-settings/preferences/_index.md new file mode 100644 index 00000000000..f364cc87d7a --- /dev/null +++ b/content/rancher/v2.x/en/tasks/user-settings/preferences/_index.md @@ -0,0 +1,5 @@ +--- +title: User Preferences +weight: 3728 +draft: true +---