From 49fca6349d3343eb69931862d2ccd6af1ed5d575 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Mon, 16 Jul 2018 21:21:23 -0700 Subject: [PATCH 1/9] fix text --- content/rancher/v2.x/en/user-settings/api-keys/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/user-settings/api-keys/_index.md b/content/rancher/v2.x/en/user-settings/api-keys/_index.md index 02f032a5183..26e80c52374 100644 --- a/content/rancher/v2.x/en/user-settings/api-keys/_index.md +++ b/content/rancher/v2.x/en/user-settings/api-keys/_index.md @@ -1,5 +1,5 @@ --- -title: Creating an API Key +title: API Keys weight: 7005 aliases: - /rancher/v2.x/en/concepts/api-keys/ From 1c78fd45feb7a771b4eaa5fa003b76c2e317d9ff Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Tue, 17 Jul 2018 09:39:54 -0700 Subject: [PATCH 2/9] moving a bunch --- .../pod-security-policies/_index.md | 10 +- .../launching-catalog-apps/_index.md | 29 ++++++ .../{members => cluster-members}/_index.md | 0 .../options/pod-security-policies/_index.md | 94 ++++++++++++++++++ content/rancher/v2.x/en/concepts/_index.md | 7 -- .../v2.x/en/concepts/resources/_index.md | 47 --------- .../en/concepts/service-discovery/_index.md | 16 --- .../rancher/v2.x/en/faq/technical/_index.md | 2 +- .../v2.x/en/kubernetes-in-rancher/_index.md | 21 ++++ .../certificates}/_index.md | 9 +- .../configmaps}/_index.md | 15 ++- .../editing-clusters/_index.md | 33 +++++++ .../kubeconfig}/_index.md | 8 +- .../kubectl}/_index.md | 10 +- .../load-balancing-and-ingress/_index.md | 4 + .../ingress}/_index.md | 24 ++--- .../load-balancing/_index.md | 6 +- .../projects-namespaces}/_index.md | 13 +-- .../creating-and-managing-projects/_index.md | 89 +++++++++++++++++ .../project-members}/_index.md | 10 +- .../registries}/_index.md | 12 ++- .../secrets}/_index.md | 13 ++- .../service-discovery}/_index.md | 11 +-- .../volumes-and-storage/_index.md | 4 +- .../volumes-and-storage/examples}/_index.md | 6 +- .../examples}/nfs/_index.md | 4 +- .../persistent-volume-claim}/_index.md | 7 +- .../_index.md | 16 +-- .../workloads/_index.md | 20 ++-- .../workloads/add-a-sidecar/_index.md | 8 +- .../workloads/deploy-workloads/_index.md | 4 +- .../workloads/rollback-workloads/_index.md | 4 +- .../workloads/upgrade-workloads/_index.md | 4 +- content/rancher/v2.x/en/tasks/_index.md | 5 - .../en/tasks/clusters/adding-a-node/_index.md | 14 --- .../adding-a-pod-security-policy/_index.md | 97 ------------------- .../adding-managing-cluster-members/_index.md | 53 ---------- .../rancher/v2.x/en/tasks/projects/_index.md | 6 -- .../projects/add-project-alerts/_index.md | 6 -- .../create-pod-security-policies/_index.md | 6 -- .../tasks/projects/create-project/_index.md | 41 -------- .../projects/enable-project-logging/_index.md | 6 -- .../projects/launch-a-catalog-app/_index.md | 33 ------- .../manage-pod-security-policies/_index.md | 6 -- .../projects/manage-project-alerts/_index.md | 6 -- .../projects/manage-project-logging/_index.md | 6 -- .../projects/manage-project-members/_index.md | 6 -- .../tasks/projects/switch-project/_index.md | 14 --- .../rancher/v2.x/en/tasks/workloads/_index.md | 10 -- 49 files changed, 412 insertions(+), 463 deletions(-) rename content/rancher/v2.x/en/clusters/{members => cluster-members}/_index.md (100%) delete mode 100644 content/rancher/v2.x/en/concepts/_index.md delete mode 100644 content/rancher/v2.x/en/concepts/resources/_index.md delete mode 100644 content/rancher/v2.x/en/concepts/service-discovery/_index.md create mode 100644 content/rancher/v2.x/en/kubernetes-in-rancher/_index.md rename content/rancher/v2.x/en/{tasks/projects/add-ssl-certificates => kubernetes-in-rancher/certificates}/_index.md (85%) rename content/rancher/v2.x/en/{tasks/projects/add-configmaps => kubernetes-in-rancher/configmaps}/_index.md (72%) create mode 100644 content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md rename content/rancher/v2.x/en/{concepts/clusters/kubeconfig-files => kubernetes-in-rancher/kubeconfig}/_index.md (87%) rename content/rancher/v2.x/en/{tasks/clusters/using-kubectl-to-access-a-cluster => kubernetes-in-rancher/kubectl}/_index.md (92%) create mode 100644 content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/_index.md rename content/rancher/v2.x/en/{tasks/workloads/add-ingress => kubernetes-in-rancher/load-balancing-and-ingress/ingress}/_index.md (97%) rename content/rancher/v2.x/en/{concepts => kubernetes-in-rancher/load-balancing-and-ingress}/load-balancing/_index.md (97%) rename content/rancher/v2.x/en/{concepts/projects => kubernetes-in-rancher/projects-namespaces}/_index.md (86%) create mode 100644 content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/creating-and-managing-projects/_index.md rename content/rancher/v2.x/en/{tasks/projects/add-project-members => kubernetes-in-rancher/projects-namespaces/project-members}/_index.md (90%) rename content/rancher/v2.x/en/{tasks/projects/add-registries => kubernetes-in-rancher/registries}/_index.md (77%) rename content/rancher/v2.x/en/{tasks/projects/add-a-secret => kubernetes-in-rancher/secrets}/_index.md (74%) rename content/rancher/v2.x/en/{tasks/workloads/add-a-dns-record => kubernetes-in-rancher/service-discovery}/_index.md (94%) rename content/rancher/v2.x/en/{concepts => kubernetes-in-rancher}/volumes-and-storage/_index.md (97%) rename content/rancher/v2.x/en/{tasks/clusters/adding-storage/provisioning-storage => kubernetes-in-rancher/volumes-and-storage/examples}/_index.md (77%) rename content/rancher/v2.x/en/{tasks/clusters/adding-storage/provisioning-storage => kubernetes-in-rancher/volumes-and-storage/examples}/nfs/_index.md (96%) rename content/rancher/v2.x/en/{tasks/workloads/add-persistent-volume-claim => kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim}/_index.md (95%) rename content/rancher/v2.x/en/{tasks/clusters/adding-storage => kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes}/_index.md (96%) rename content/rancher/v2.x/en/{concepts => kubernetes-in-rancher}/workloads/_index.md (89%) rename content/rancher/v2.x/en/{tasks => kubernetes-in-rancher}/workloads/add-a-sidecar/_index.md (95%) rename content/rancher/v2.x/en/{tasks => kubernetes-in-rancher}/workloads/deploy-workloads/_index.md (97%) rename content/rancher/v2.x/en/{tasks => kubernetes-in-rancher}/workloads/rollback-workloads/_index.md (87%) rename content/rancher/v2.x/en/{tasks => kubernetes-in-rancher}/workloads/upgrade-workloads/_index.md (92%) delete mode 100644 content/rancher/v2.x/en/tasks/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/clusters/adding-a-node/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/clusters/adding-managing-cluster-members/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/add-project-alerts/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/create-pod-security-policies/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/create-project/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/enable-project-logging/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/launch-a-catalog-app/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/manage-pod-security-policies/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/manage-project-alerts/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/manage-project-logging/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/manage-project-members/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/projects/switch-project/_index.md delete mode 100644 content/rancher/v2.x/en/tasks/workloads/_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 9857571848c..b2aa12204c4 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 @@ -51,7 +51,15 @@ Using Rancher, you can create a Pod Security Policy using our GUI rather than cr ### What's Next? -Now that you've created a Pod Security Policy, you can apply it to clusters and projects. For more information, see [Adding a Pod Security Policy to a Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy). +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) + +> **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/catalog-and-charts/launching-catalog-apps/_index.md b/content/rancher/v2.x/en/catalog-and-charts/launching-catalog-apps/_index.md index 6d1645d43e7..4e90666473c 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 @@ -2,3 +2,32 @@ title: Launching Catalog Applications 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). + +1. From the **Global** view, open the project that you want to deploy to. + +2. From the main menu, choose **Catalog Apps**. Then click **Launch**. + +3. Find the app that you want to launch, and then click **View Now**. + +4. Under **Configuration Options** enter a **Name**. By default, this name is also used to create a Kubernetes namespace for the application. + + * If you would like to change the **Namespace**, click **Customize** and enter a new name. + * If you want to use a different namespace that already exists, click **Customize**, and then click **Use an existing namespace**. Choose a namespace from the list. + +5. Select a **Template Version**. + +6. Complete the rest of the **Configuration Options**. + + * For native Helm charts (i.e., charts from the **Helm Stable** or **Helm Incubator** catalogs), answers are provided as key value pairs in the **Answers** section. + * Keys and values are available within **Detailed Descriptions**. + +7. Review the files in **Preview**. When you're satisfied, click **Launch**. + +**Result**: Your application is deployed to your chosen namespace. You can view the application status from the project's: + +- **Workloads** view +- **Catalog Apps** view diff --git a/content/rancher/v2.x/en/clusters/members/_index.md b/content/rancher/v2.x/en/clusters/cluster-members/_index.md similarity index 100% rename from content/rancher/v2.x/en/clusters/members/_index.md rename to content/rancher/v2.x/en/clusters/cluster-members/_index.md diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md index 7919b19cce0..82e3da30dae 100644 --- a/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md +++ b/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md @@ -2,3 +2,97 @@ title: Pod Security Policies weight: 2260 --- + + +_Pod Security Policies_ are objects that control security-sensitive aspects of pod specification (like root privileges). + +You can add a Pod Security Policy (PSPs hereafter) in the following contexts: + +- [When creating a cluster](#cluster-creation--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](#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. + +For more information about PSPs, refer to [Pod Security Policy]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies). + +## Cluster Creation: Adding a Default Pod Security Policy + +When you create a new cluster, you can configure it to apply a PSP immediately. As you create the cluster, use the **Cluster Options** to enable a PSP. The PSP assigned to the cluster will be the default PSP for projects within the cluster. + +>**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/admin-settings/pod-security-policies/). +>**Note:** +>For security purposes, we recommend assigning 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. + +When the cluster finishes provisioning, the PSP you selected is applied to all projects within the cluster. + +For detailed instruction about assigning a PSP to a new cluster, see [Creating a Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/). + +## Existing Cluster: Adding a Pod Security Policy + +If you don't apply a PSP as you create your cluster, you can always add one later. + +>**Prerequisite:** +>Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing cluster, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). + +1. From the **Global** view, find the cluster that you want to apply your PSP to. Select **Vertical Ellipsis (...) > Edit** for the cluster you want to enable PSPs for. + +2. Expand the **Cluster Options** accordion. + +3. From **Pod Security Policy Support**, select **Enabled**. + + >**Note:** Not all cluster providers support PSPs, so this option may not be available. + + **Step Result:** The **Default Pod Security Policy** drop-down activates. + +4. From **Default Pod Security Policy**, select the PSP you want to apply to the cluster. + +5. Click **Save**. + +**Result:** The PSP is applied to the cluster and any projects within the cluster. + +>**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. + +## Project Creation: Adding a Pod Security Policy + +When you create a new project, you can assign a PSP directly to the project. Assigning a PSP to a project will: + +- Override the cluster's default PSP. +- Apply the PSP to the project. +- Apply the PSP to any namespaces you add to the project later. + +>**Prerequisites:** +> +> - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to a new project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). +> - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [Existing Cluster: Adding a Pod Security Policy](#existing-cluster--adding-a-pod-security-policy). + +As you create the project, make a selection from the **Pod Security Policy** drop-down to assign a PSP. + + + +## Existing Project: Adding a Pod Security Policy + +You can always assign a PSP to an existing project if you didn't assign one during creation. + +>**Prerequisites:** +> +> - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). +> - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [Existing Cluster: Adding a Pod Security Policy](#existing-cluster--adding-a-pod-security-policy). + +1. From the **Global** view, find the cluster containing the project you want to apply a PSP to. + +1. From the main menu, select **Projects/Namespaces**. + +3. Find the project that you want to add a PSP to. From that project, select **Vertical Ellipsis (...) > Edit**. + +4. From the **Pod Security Policy** drop-down, select the PSP you want to apply to the project. + +5. Click **Save**. + +**Result:** The PSP is applied to the project and any namespaces added to the project. + +>**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. diff --git a/content/rancher/v2.x/en/concepts/_index.md b/content/rancher/v2.x/en/concepts/_index.md deleted file mode 100644 index 1242f168e07..00000000000 --- a/content/rancher/v2.x/en/concepts/_index.md +++ /dev/null @@ -1,7 +0,0 @@ ---- - title: Concepts - weight: 2000 ---- -This section describes the different features in Rancher, the ideas behind them, and how they work. - -Choose a concept from the side-menu to start learning about Rancher! diff --git a/content/rancher/v2.x/en/concepts/resources/_index.md b/content/rancher/v2.x/en/concepts/resources/_index.md deleted file mode 100644 index 70411d7e264..00000000000 --- a/content/rancher/v2.x/en/concepts/resources/_index.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -title: Resources -weight: 2275 ---- - -Within the context of a Rancher project or namespace, _resources_ are files and data that support operation of your pods. Within this scope, resources include: - -- [Certificates](#certificates) -- [ConfigMaps](#configmaps) -- [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. - -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. Read on below. - -## Certificates - -When you create an ingress within Rancher/Kubernetes, you must provide it with a secret that includes a TLS private key and certificate, which are used to encrypt and decrypt communications that come through the ingress. You can make certificates available for ingress use by navigating to its project or namespace, and then uploading the certificate. You can then add the certificate to the ingress deployment. - -## ConfigMaps - -While most types of Kubernetes secrets store sensitive information, [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) store general configuration information, such as a group of config files. Because ConfigMaps don't store sensitive information, they can be updated automatically, and therefore don't require their containers to be restarted following update (unlike most secret types, which require manual updates and a container restart to take effect). - -ConfigMaps accept key value pairs in common string formats, like config files or JSON blobs. After you upload a config map, any workload can reference it as either an environment variable or a volume mount. - ->**Note:** ConfigMaps are only available within namespaces and not projects. - -## Secrets - -[Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#overview-of-secrets) store sensitive data like passwords, tokens, or keys. They may contain one or more key value pairs. -When configuring a workload, you'll be able to choose which secrets to include. Like config maps, secrets can be referenced by workloads as either an environment variable or a volume mount. - ->**Note:** Any update to secrets won't reflect automatically inside pods, until the pods are restarted. - -## Registries - -Registries are secrets containing credentials used to authenticate with [private registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/). Deployments use these secrets to authenticate with a private registry and then pull a Docker image hosted on it. - ->**Note:** Currently, credentials are pulled automatically only if the workload is created in the Rancher UI and not kubectl. - -## Related Links - -- [Adding SSL Certificates]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-ssl-certificates) -- [Adding ConfigMaps]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-configmaps) -- [Adding Secrets]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-a-secret) -- [Adding Registries]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-registries) diff --git a/content/rancher/v2.x/en/concepts/service-discovery/_index.md b/content/rancher/v2.x/en/concepts/service-discovery/_index.md deleted file mode 100644 index b3dff86b4b8..00000000000 --- a/content/rancher/v2.x/en/concepts/service-discovery/_index.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Service Discovery -weight: 2200 -draft: true ---- - -## Related Links - -### Tutorials - -- [Adding a DNS Record]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/add-a-dns-record) - -### External Links - -- [Services](https://kubernetes.io/docs/concepts/services-networking/service/) -- [Adding entries to Pod /etc/hosts with HostAliases](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/) diff --git a/content/rancher/v2.x/en/faq/technical/_index.md b/content/rancher/v2.x/en/faq/technical/_index.md index 3df6cd1abfc..75066217459 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/concepts/clusters/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/clusters/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/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/_index.md new file mode 100644 index 00000000000..5ffa334dd0d --- /dev/null +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/_index.md @@ -0,0 +1,21 @@ +--- +title: Kubernetes in Rancher +weight: 3000 +aliases: + - /rancher/v2.x/en/concepts/ + - /rancher/v2.x/en/tasks/ + - /rancher/v2.x/en/concepts/resources/ +--- + + + +Within the context of a Rancher project or namespace, _resources_ are files and data that support operation of your pods. Within this scope, resources include: + +- [Certificates](#certificates) +- [ConfigMaps](#configmaps) +- [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. + +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/tasks/projects/add-ssl-certificates/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/certificates/_index.md similarity index 85% rename from content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/certificates/_index.md index a9dfeaac88d..993e56f5799 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/certificates/_index.md @@ -1,8 +1,11 @@ --- -title: Adding SSL Certificates -weight: +title: SSL Certificates +weight: 3060 +aliases: + - /rancher/v2.x/en/tasks/projects/add-ssl-certificate/ --- -When you create an ingress within Rancher/Kubernetes, you must provide it with a TLS private key and certificate, which are used to encrypt and decrypt communications that come through the ingress. You can make certificates available for ingress use by navigating to its project or namespace, and then uploading the certificate. + +When you create an ingress within Rancher/Kubernetes, you must provide it with a secret that includes a TLS private key and certificate, which are used to encrypt and decrypt communications that come through the ingress. You can make certificates available for ingress use by navigating to its project or namespace, and then uploading the certificate. You can then add the certificate to the ingress deployment. Add SSL certificates to either projects, namespaces, or both. A project scoped certificate will be available in all its namespaces. diff --git a/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/configmaps/_index.md similarity index 72% rename from content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/configmaps/_index.md index 87476fd20c7..ba7049d6da7 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/configmaps/_index.md @@ -1,8 +1,17 @@ --- -title: Adding ConfigMaps -weight: +title: ConfigMaps +weight: 3061 +aliases: + - /rancher/v2.x/en/tasks/projects/add-configmaps --- + +While most types of Kubernetes secrets store sensitive information, [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) store general configuration information, such as a group of config files. Because ConfigMaps don't store sensitive information, they can be updated automatically, and therefore don't require their containers to be restarted following update (unlike most secret types, which require manual updates and a container restart to take effect). + +ConfigMaps accept key value pairs in common string formats, like config files or JSON blobs. After you upload a config map, any workload can reference it as either an environment variable or a volume mount. + +>**Note:** ConfigMaps are only available within namespaces and not projects. + ConfigMaps store general configuration information for an application, such as configuration files, command-line arguments, environment variables, etc. ConfigMaps accept key value pairs in common string formats, like config files or JSON blobs. Add ConfigMaps to your Rancher workspaces so that you can add them to your workloads later. For more information on ConfigMaps, see the official [Kubernetes Documentation: Using ConfigMap](https://kubernetes-v1-4.github.io/docs/user-guide/configmap/). >**Note:** ConfigMaps can only be applied to namespaces and not projects. @@ -36,4 +45,4 @@ Now that you have a ConfigMap added to a namespace, you can add it to a workload - Application environment variables. - Specifying parameters for a Volume mounted to the workload. -For more information on adding ConfigMaps to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/). \ No newline at end of file +For more information on adding ConfigMaps to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/). diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md new file mode 100644 index 00000000000..743aa72305f --- /dev/null +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md @@ -0,0 +1,33 @@ +--- +title: Editing Clusters +weight: 3015 +draft: true +--- + +## Increasing Number of nodes + + +## Adding a Pod Security Policy + +If you don't apply a PSP as you create your cluster, you can always add one later. + +>**Prerequisite:** +>Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing cluster, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). + +1. From the **Global** view, find the cluster that you want to apply your PSP to. Select **Vertical Ellipsis (...) > Edit** for the cluster you want to enable PSPs for. + +2. Expand the **Cluster Options** accordion. + +3. From **Pod Security Policy Support**, select **Enabled**. + + >**Note:** Not all cluster providers support PSPs, so this option may not be available. + + **Step Result:** The **Default Pod Security Policy** drop-down activates. + +4. From **Default Pod Security Policy**, select the PSP you want to apply to the cluster. + +5. Click **Save**. + +**Result:** The PSP is applied to the cluster and any projects within the cluster. + +>**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. diff --git a/content/rancher/v2.x/en/concepts/clusters/kubeconfig-files/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/kubeconfig/_index.md similarity index 87% rename from content/rancher/v2.x/en/concepts/clusters/kubeconfig-files/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/kubeconfig/_index.md index c13ebb3e2e6..d66f8f8b174 100644 --- a/content/rancher/v2.x/en/concepts/clusters/kubeconfig-files/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/kubeconfig/_index.md @@ -1,6 +1,8 @@ --- title: Kubeconfig Files -weight: 2100 +weight: 3010 +aliases: + - /rancher/v2.x/en/concepts/clusters/kubeconfig-files/ --- A _kubeconfig file_ is a file used to configure access to Kubernetes when used in conjunction with the kubectl commandline tool (or other clients). @@ -11,11 +13,9 @@ When you create a cluster using the Rancher GUI, Rancher automatically creates a This kubeconfig file and its contents are specific to the cluster you are viewing. You will need a separate kubeconfig file for each cluster that you have access to in Rancher. -For more information, see [Using kubectl to Access a Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/using-kubectl-to-access-a-cluster). +For more information, see [Using kubectl to Access a Cluster]({{< baseurl >}}/rancher/v2.x/en//kubernetes-in-rancher/kubectl). >**Note:** By default, kubectl checks `~/.kube/config` for kubeconfig files, but you can use any directory you want using the `--kubeconfig` flag. For example: >``` kubectl --kubeconfig /custom/path/kube.config get pods ``` - - diff --git a/content/rancher/v2.x/en/tasks/clusters/using-kubectl-to-access-a-cluster/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/kubectl/_index.md similarity index 92% rename from content/rancher/v2.x/en/tasks/clusters/using-kubectl-to-access-a-cluster/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/kubectl/_index.md index cb9930f726e..93b13e310d4 100644 --- a/content/rancher/v2.x/en/tasks/clusters/using-kubectl-to-access-a-cluster/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/kubectl/_index.md @@ -1,6 +1,8 @@ --- title: Using kubectl to Access a Cluster -weight: 3450 +weight: 3005 +aliases: + - /rancher/v2.x/en/tasks/clusters/using-kubectl-to-access-a-cluster/ --- You can access and manage your Kubernetes clusters using kubectl in two ways: @@ -12,7 +14,7 @@ You can access and manage your Kubernetes clusters using kubectl in two ways: You can access and manage your clusters by logging into Rancher and opening the kubectl shell. No further configuration necessary. 1. From the **Global** view, open the cluster that you want to access with kubectl. - + 2. Click **Launch kubectl**. Use the window that opens to interact with your Kubernetes cluster. For more information on using kubectl, see [Kubernetes Documentation: Overview of kubectl](https://kubernetes.io/docs/reference/kubectl/overview/). @@ -26,7 +28,7 @@ Alternatively, you can access your clusters by installing kubectl on your workst 2. Log into Rancher. From the **Global** view, open the cluster that you want to access with kubectl. -3. Copy the cluster's kubeconfig file to your workstation. +3. Copy the cluster's kubeconfig file to your workstation. 1. Click **Kubeconfig File**. @@ -41,4 +43,4 @@ Alternatively, you can access your clusters by installing kubectl on your workst ``` 4. From your workstation, launch kubectl. Use it to interact with your kubernetes cluster. - For more information on using kubectl, see [Kubernetes Documentation: Overview of kubectl](https://kubernetes.io/docs/reference/kubectl/overview/). \ No newline at end of file + For more information on using kubectl, see [Kubernetes Documentation: Overview of kubectl](https://kubernetes.io/docs/reference/kubectl/overview/). diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/_index.md new file mode 100644 index 00000000000..bfc50aec574 --- /dev/null +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/_index.md @@ -0,0 +1,4 @@ +--- +title: Load Balancing and Ingresses +weight: 3040 +--- diff --git a/content/rancher/v2.x/en/tasks/workloads/add-ingress/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/ingress/_index.md similarity index 97% rename from content/rancher/v2.x/en/tasks/workloads/add-ingress/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/ingress/_index.md index a527ae01887..61e7ebda9dc 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-ingress/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/ingress/_index.md @@ -1,6 +1,6 @@ --- -title: Adding Ingress -weight: 50 +title: Ingress +weight: 3042 --- Ingress can be added for workloads to provide load balancing, SSL termination and host/path based routing. @@ -16,13 +16,13 @@ Ingress can be added for workloads to provide load balancing, SSL termination an 1. Create ingress forwarding **Rules**. - **Automatically generate a xip.io hostname** - + If you choose this option, ingress routes requests to hostname to a DNS name that's automatically generated. Rancher uses [xip.io](http://xip.io/) to automatically generates the DNS name. This option is best used for testing, _not_ production environments. >**Note:** To use this option, you must be able to resolve to `xip.io` addresses. - + 1. Add a **Target Backend**. By default, a workload is added to the ingress, but you can add more targets by clicking either **Service** or **Workload**. - + 1. **Optional:** If you want specify a workload or service when a request is sent to a particular hostname path, add a **Path** for the target. For example, if you want requests for `www.mysite.com/contact-us` to be sent to a different service than `www.mysite.com`, enter `/contact-us` in the **Path** field. Typically, the first rule that you create does not include a path. @@ -32,13 +32,13 @@ Ingress can be added for workloads to provide load balancing, SSL termination an 1. Enter the **Port** number that each target operates on. - **Specify a hostname to use** - + If you use this option, ingress routes requests for a hostname to the service or workload that you specify. 1. Enter the hostname that your ingress will handle request forwarding for. For example, `www.mysite.com`. - + 1. Add a **Target Backend**. By default, a workload is added to the ingress, but you can add more targets by clicking either **Service** or **Workload**. - + 1. **Optional:** If you want specify a workload or service when a request is sent to a particular hostname path, add a **Path** for the target. For example, if you want requests for `www.mysite.com/contact-us` to be sent to a different service than `www.mysite.com`, enter `/contact-us` in the **Path** field. Typically, the first rule that you create does not include a path. @@ -46,16 +46,16 @@ Ingress can be added for workloads to provide load balancing, SSL termination an 1. Select a workload or service from the **Target** drop-down list for each target you've added. 1. Enter the **Port** number that each target operates on. - + - **Use as the default backend** - + Use this option to set an ingress rule for handling requests that don't match any other ingress rules. For example, use this option to route requests that can't be found to a `404` page. >**Note:** If you deployed Rancher using RKE, a default backend for 404s and 202s is already configured. - + 1. Add a **Target Backend**. Click either **Service** or **Workload** to add the target. - + 1. Select a service or workload from the **Target** drop-down list. 1. **Optional:** click **Add Rule** to create additional ingress rules. For example, after you create ingress rules to direct requests for your hostname, you'll likely want to create a default backend to handle 404s. diff --git a/content/rancher/v2.x/en/concepts/load-balancing/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/load-balancing/_index.md similarity index 97% rename from content/rancher/v2.x/en/concepts/load-balancing/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/load-balancing/_index.md index f78cdbb88b0..d994204605e 100644 --- a/content/rancher/v2.x/en/concepts/load-balancing/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/load-balancing/_index.md @@ -1,6 +1,8 @@ --- -title: Load Balancing -weight: 2175 +title: Load Balancing and Ingresses +weight: 3041 +aliases: + - /rancher/v2.x/en/concepts/load-balancing/ --- Kubernetes supports load balancing in two ways: Layer-4 Load Balancing and Layer-7 Load Balancing. diff --git a/content/rancher/v2.x/en/concepts/projects/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/_index.md similarity index 86% rename from content/rancher/v2.x/en/concepts/projects/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/_index.md index d4704f3bfb0..27daae932fd 100644 --- a/content/rancher/v2.x/en/concepts/projects/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/_index.md @@ -1,8 +1,13 @@ --- -title: Projects -weight: 2150 +title: Projects and Namespaces +weight: 3020 +aliases: + - /rancher/v2.x/en/concepts/projects/ --- +_Projects_ are a new feature in Rancher that allows you to group namespaces. Users can be added as members to the project, and the project owner can assign roles to each member to control their project access. + + _Projects_ are a new concept introduced by Rancher. They are not a native Kubernetes construct. A project captures a set of policies for a set of namespaces. A user can be assigned a specific role in a project. A role can be owner, member, read-only, or [custom]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/#adding-a-custom-role). Policies include Kubernetes Role-Based Access Control (RBAC) policies and pod security policies. Rancher 2.0 also implements a canned network policy that isolates containers in different projects. Future versions of Rancher will implement more flexible network policies. ### Authorization @@ -21,7 +26,3 @@ Rancher extends Kubernetes to allow the application of [Pod Security Policies](h Kubernetes resources belong to specific namespaces. Rancher 2.0 relies on namespaces to isolate resources among users and apps. When the user deploys an app from the catalog, for example, he can choose to deploy that app into its own namespace, so that resource names in one app will not conflict with resource names in another. Namespaces must be globally unique. It is often difficult for users to pick unique namespace names. Rancher therefore encourages the pattern where users work with projects, and the system generates unique namespace names automatically. For more information, see the [Kubernetes Namespaces Documentation](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/). - -## Related Links - -- [Project Tutorials]({{< baseurl >}}/rancher/v2.x/en/tasks/projects) 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-namespaces/creating-and-managing-projects/_index.md new file mode 100644 index 00000000000..22a7531e685 --- /dev/null +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/creating-and-managing-projects/_index.md @@ -0,0 +1,89 @@ +--- +title: Creating and Managing Projects +weight: 3021 +aliases: + - /rancher/v2.x/en/tasks/projects/create-project/ +--- + + +1. From the **Global** view, choose **Clusters** from the main menu. From the **Clusters** page, open the cluster from which you want to create a project. + +1. From the main menu, choose **Projects/Namespaces**. Then click **Add Project**. + +1. Enter a **Project Name**. + +1. **Optional:** Select a **Pod Security Policy**. + + [What are Pod Security Policies?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies) + + >**Note:** This option is only available if you've already created a Pod Security Policy. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/#creating-pod-security-policies). + +1. **Recommended:** Add project members. + + Use the **Members** accordion to provide other users with project access and roles. + + By default, your user is added as the project `Owner`. + + 1. Click **Add Member**. + + 1. From the **Name** combo box, search for a user or group that you want to assign project access. + + >**Note:** You can only search for groups if external authentication is enabled. + + 1. From the **Role** drop-down, choose a role. + + [What are Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#cluster-and-project-roles) + + >**Tip:** Choose Custom to create a custom role on the fly: [Custom Project Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#custom-project-roles). + + 1. To add more members, repeat substeps a—c. + + +1. Click **Create**. + +**Result:** Your project is created. You can view it from the cluster's **Projects/Namespaces** view. + +## Switching projects + +To switch between clusters, use the **Global** drop-down available in the main menu. + +![Global Menu]({{< baseurl >}}/img/rancher/global-menu.png) + +Alternatively, you can switch between projects and clusters using the main menu. + +- To switch between clusters, open the **Global** view and select **Clusters** from the main menu. Then open a cluster. +- To switch between projects, open a cluster, and then select **Projects/Namespaces** from the main menu. Select the link for the project that you want to open. + + +## Editing the Pod Security Policy + +You can always assign a PSP to an existing project if you didn't assign one during creation. + +>**Prerequisites:** +> +> - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). +> - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [Existing Cluster: Adding a Pod Security Policy](#existing-cluster--adding-a-pod-security-policy). + +1. From the **Global** view, find the cluster containing the project you want to apply a PSP to. + +1. From the main menu, select **Projects/Namespaces**. + +3. Find the project that you want to add a PSP to. From that project, select **Vertical Ellipsis (...) > Edit**. + +4. From the **Pod Security Policy** drop-down, select the PSP you want to apply to the project. + Assigning a PSP to a project will: + + - Override the cluster's default PSP. + - Apply the PSP to the project. + - Apply the PSP to any namespaces you add to the project later. + + >**Prerequisites:** + > + > - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to a new project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). + > - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. + +5. Click **Save**. + +**Result:** The PSP is applied to the project and any namespaces added to the project. + +>**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. diff --git a/content/rancher/v2.x/en/tasks/projects/add-project-members/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/project-members/_index.md similarity index 90% rename from content/rancher/v2.x/en/tasks/projects/add-project-members/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/project-members/_index.md index 04046b75e43..940e4e2e551 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-project-members/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-namespaces/project-members/_index.md @@ -1,15 +1,17 @@ --- -title: Adding Project Members -weight: +title: Adding and Managing Project Members +weight: 3022 +aliases: + - /rancher/v2.x/en/tasks/projects/add-project-members/ --- 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/adding-users) instead. +>**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. There are two contexts where you can add project members: -- [Adding Members to a New Project]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/create-project) +- [Adding Members to a New Project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-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/tasks/projects/add-registries/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/registries/_index.md similarity index 77% rename from content/rancher/v2.x/en/tasks/projects/add-registries/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/registries/_index.md index ab5a9f56bde..bd60189f703 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-registries/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/registries/_index.md @@ -1,10 +1,16 @@ --- -title: Adding Registries -weight: +title: Registries +weight: 3063 +aliases: + - /rancher/v2.x/en/tasks/projects/add-registries/ --- Registries are secrets containing credentials used to authenticate with [private registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/). Deployments use these secrets to authenticate with a private registry and then pull a Docker image hosted on it. +>**Note:** Currently, credentials are pulled automatically only if the workload is created in the Rancher UI and not kubectl. + +Registries are secrets containing credentials used to authenticate with [private registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/). Deployments use these secrets to authenticate with a private registry and then pull a Docker image hosted on it. + >**Prerequisites:** You must have a [private registry](https://docs.docker.com/registry/deploying/) configured. >**Note:** Currently, credentials are pulled automatically only if the workload is created in the Rancher UI and not kubectl. @@ -22,7 +28,7 @@ Registries are secrets containing credentials used to authenticate with [private 1. Select the website that hosts your private registry. Then enter credentials that authenticate with the registry. 1. Click **Save**. - + **Result:** Your secret is added to the project or namespace, depending on the scope you chose. You can view the secret in the Rancher UI from the **Resources > Registries** view. ## What's Next? diff --git a/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/secrets/_index.md similarity index 74% rename from content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/secrets/_index.md index c95c8ccb660..aadd08f68ac 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/secrets/_index.md @@ -1,8 +1,15 @@ --- -title: Adding a Secret -weight: +title: Secrets +weight: 3062 +aliases: + - /rancher/v2.x/en/tasks/projects/add-a-secret --- +[Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#overview-of-secrets) store sensitive data like passwords, tokens, or keys. They may contain one or more key value pairs. +When configuring a workload, you'll be able to choose which secrets to include. Like config maps, secrets can be referenced by workloads as either an environment variable or a volume mount. + +>**Note:** Any update to secrets won't reflect automatically inside pods, until the pods are restarted. + [Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#overview-of-secrets) store sensitive data like passwords, tokens, or keys. They may contain one or more key value pairs. When creating a secret, you can make it available for any deployment within a project, or you can limit it to a single namespace. @@ -24,7 +31,7 @@ When creating a secret, you can make it available for any deployment within a pr > ![Bulk Key Value Pair Copy/Paste]({{< baseurl >}}/img/rancher/bulk-key-values.gif) 1. Click **Save**. - + **Result:** Your secret is added to the project or namespace, depending on the scope you chose. You can view the secret in the Rancher UI from the **Resources > Secrets** view. ## What's Next? diff --git a/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/service-discovery/_index.md similarity index 94% rename from content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/service-discovery/_index.md index aaba2afdc6f..6bc3693feb0 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/service-discovery/_index.md @@ -1,8 +1,11 @@ --- -title: Adding a DNS Record -weight: 75 +title: Service Discovery +weight: 3045 +aliases: + - /rancher/v2.x/en/tasks/workloads/add-a-dns-record/ --- + For every workload created, a complementing Service Discovery entry is created. This Service Discovery entry enables DNS resolution for the workload's pods using the following naming convention: `..svc.cluster.local`. @@ -47,10 +50,6 @@ However, you also have the option of creating additional Service Discovery recor ## Related Links -### Tutorials - -- [Service Discovery]({{< baseurl >}}/rancher/v2.x/en/concepts/service-discovery) - ### External Links - [Adding entries to Pod /etc/hosts with HostAliases](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/) diff --git a/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md similarity index 97% rename from content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md index a7cb44d3c05..e92694c5e1c 100644 --- a/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md @@ -1,6 +1,8 @@ --- title: Volumes and Storage -weight: 2225 +weight: 3050 +aliases: + - /rancher/v2.x/en/concepts/volumes-and-storage/ --- There are two ways to create volumes on Kubernetes: Persistent Volumes (PVs) and Storage Classes. diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/_index.md similarity index 77% rename from content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/_index.md index e29fc390d43..26c4f07257a 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/_index.md @@ -1,6 +1,8 @@ --- -title: Provisioning Storage -weight: 3500 +title: Provisioning Storage Examples +weight: 3053 +aliases: + - /rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/ --- Rancher supports persistent storage with a variety of volume plugins. However, before you use any of these plugins to bind persistent storage to your workloads, you have to configure the storage itself, whether its a cloud-based solution from a service-provider or an on-prem solution that you manage yourself. diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md similarity index 96% rename from content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md index ec4a49d4cf1..5ec977c7b74 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md @@ -1,6 +1,8 @@ --- title: Provisioning NFS Storage -weight: 3500 +weight: 3054 +aliases: + - /rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/ --- Before you can use the NFS storage volume plug-in with Rancher deployments, you need to provision an NFS server. diff --git a/content/rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md similarity index 95% rename from content/rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md index 93ef3081f8b..709e9504ddd 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md @@ -1,6 +1,8 @@ --- -title: Adding a Persistent Volume Claim -weight: 100 +title: Persistent Volume Claims +weight: 3052 +aliases: + - /rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim --- _Persistent Volume Claims_ (or PVCs) are objects that request storage resources from your cluster. They're similar to a voucher that your deployment can redeem for storage access. When you create a deployment, you should usually attach a PVC so that your application can lay claim to persistent storage. This claim lets your deployment application store its data in an external location, so that if one of the application's containers fails, it can be replaced with a new container and continue accessing its data stored externally, as though an outage never occured. @@ -39,4 +41,3 @@ _Persistent Volume Claims_ (or PVCs) are objects that request storage resources 7. **Optional:** From **Customize**, select the [Access Modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) that you want to use. **Result:** Your PVC is created. You can now attach it to any workload in the project. - diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md similarity index 96% rename from content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md index f3c86dbaedf..cfe86c940ce 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md @@ -1,9 +1,11 @@ --- -title: Adding Storage -weight: 3500 +title: Persistent Volumes and Storage Classes +weight: 3051 +aliases: + - /rancher/v2.x/en/tasks/clusters/adding-storage/ --- ->**Prerequisites:** +>**Prerequisites:** > >- Working with storage requires the `Manage Volumes` [role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#project-role-reference). >- You must have a storage medium provisioned. For more information, see [Provisioning Storage](provisioning-storage). @@ -30,7 +32,7 @@ Persistent volumes can either be a disk or file system that you host on premise, 1. Select the **Volume Plugin** for the disk type or service that you're using. >**Note:** If the cluster you are adding storage for is a cloud service that also offers cloud storage, you must enable the `cloud provider` option for the cluster, and you must use the service's plug-in to use cloud storage. For example, if you have a Amazon EC2 cluster and you want to use cloud storage for it: - + 1. You must enable the `cloud provider` option for the EC2 cluster. 2. You must use the `Amazon EBS Disk` volume plugin. @@ -60,7 +62,7 @@ Persistent volumes can either be a disk or file system that you host on premise, ## Adding Storage Classes -_Storage Classes_ allow you to dynamically provision persistent volumes on demand. Think of storage classes as storage profiles that are created automatically upon a request (which is known as a _persistent volume claim_). +_Storage Classes_ allow you to dynamically provision persistent volumes on demand. Think of storage classes as storage profiles that are created automatically upon a request (which is known as a _persistent volume claim_). 1. From the **Global** view, open the cluster for which you want to dynamically provision persistent storage volumes. @@ -71,7 +73,7 @@ _Storage Classes_ allow you to dynamically provision persistent volumes on deman 1. From the `Provisioner` drop-down, select the service that you want to use to dynamically provision storage volumes. >**Note:** If the cluster you are adding a storage class for is a cloud service that also offers cloud storage, you must enable the `cloud provider` option for the cluster, and you must use the service's plug-in to use cloud storage. For example, if you have a Amazon EC2 cluster and you want to use cloud storage for it: - + 1. You must enable the `cloud provider` option for the EC2 cluster. 2. You must use the `Amazon EBS Disk` provisioner. @@ -87,4 +89,4 @@ Mount Persistent Volumes to workloads so that your applications can store their You can mount Persistent Volumes in one of two contexts: - During deployment of a workload (recommended if possible). For more information, see [Deploying Workloads](../../workloads/deploy-workloads/). -- Following workload creation. For more information, see [Adding Persistent Volume Claims](../../workloads/add-persistent-volume-claim/). \ No newline at end of file +- Following workload creation. For more information, see [Adding Persistent Volume Claims](../../workloads/add-persistent-volume-claim/). diff --git a/content/rancher/v2.x/en/concepts/workloads/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/_index.md similarity index 89% rename from content/rancher/v2.x/en/concepts/workloads/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/workloads/_index.md index 7dfb09147a7..c4ad6632002 100644 --- a/content/rancher/v2.x/en/concepts/workloads/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/_index.md @@ -1,7 +1,11 @@ --- title: Workloads -weight: 2175 +weight: 3025 +aliases: + - /rancher/v2.x/en/concepts/workloads/ + - /rancher/v2.x/en/tasks/workloads/ --- + You can build any complex containerized application in Kubernetes using two basic constructs: pods and workloads. Once you build an application, you can expose it for access either within the same cluster or on the Internet using a third construct: services. ### Pods @@ -43,7 +47,7 @@ In many use cases, a workload has to be either: - Accessed by other workloads in the cluster. - Exposed to the outside world. - + You can achieve these goals by creating a _Service_. Services are mapped to the underlying workload's pods using a [selector/label approach (view the code samples)](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#service-and-replicationcontroller). Rancher UI simplifies this mapping process by automatically creating a service along with the workload, using the service port and type that you select. #### Service Types @@ -62,12 +66,16 @@ There are several types of services available in Rancher. The descriptions below >Exposes the service externally using a cloud provider’s load balancer. `NodePort` and `ClusterIP` services, to which the external load balancer will route, are automatically created. +## Workload Options + +This section of the documentation contains instructions for deploying workloads and using workload options. + + - [Deploy Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/) + - [Upgrade Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/upgrade-workloads/) + - [Rollback Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/rollback-workloads/) + ## Related Links ### External Links - [Services](https://kubernetes.io/docs/concepts/services-networking/service/) - -### Tutorials - -- [Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/) diff --git a/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/add-a-sidecar/_index.md similarity index 95% rename from content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/workloads/add-a-sidecar/_index.md index a044732e71f..9ff53474a61 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/add-a-sidecar/_index.md @@ -1,6 +1,8 @@ --- title: Adding a Sidecar -weight: 200 +weight: 3029 +aliases: + - /rancher/v2.x/en/concepts/workloads/add-a-sidecar/ --- A _sidecar_ is a container that extends or enhances the main container in a pod. The main container and the sidecar share a pod, and therefore share the same network space and storage. You can add sidecars to existing workloads by using the **Add a Sidecar** option. @@ -15,11 +17,11 @@ A _sidecar_ is a container that extends or enhances the main container in a pod. 1. Select a **Sidecar Type**. This option determines if the sidecar container is deployed before or after the main container is deployed. - **Standard Container:** - + The sidecar container is deployed after the main container. - **Init Container:** - + The sidecar container is deployed before the main container. 1. From the **Docker Image** field, enter the name of the Docker image that you want to deploy in support of the main container. During deployment, Rancher pulls this image from [Docker Hub](https://hub.docker.com/explore/). Enter the name exactly as it appears on Docker Hub. diff --git a/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/_index.md similarity index 97% rename from content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/_index.md index dd628ed2a90..0f799a9a42d 100644 --- a/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/_index.md @@ -1,6 +1,8 @@ --- title: Deploying Workloads -weight: 25 +weight: 3026 +aliases: + - /rancher/v2.x/en/concepts/workloads/deploy-workloads/ --- Deploy a workload to run an application in one or more containers. diff --git a/content/rancher/v2.x/en/tasks/workloads/rollback-workloads/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/rollback-workloads/_index.md similarity index 87% rename from content/rancher/v2.x/en/tasks/workloads/rollback-workloads/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/workloads/rollback-workloads/_index.md index 0c83bdb1993..431711c16f8 100644 --- a/content/rancher/v2.x/en/tasks/workloads/rollback-workloads/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/rollback-workloads/_index.md @@ -1,6 +1,8 @@ --- title: Rolling Back Workloads -weight: 150 +weight: 3027 +aliases: + - /rancher/v2.x/en/concepts/workloads/rollback-workloads/ --- Sometimes there is a need to rollback to the previous version of the application, either for debugging purposes or because an upgrade did not go as planned. diff --git a/content/rancher/v2.x/en/tasks/workloads/upgrade-workloads/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/upgrade-workloads/_index.md similarity index 92% rename from content/rancher/v2.x/en/tasks/workloads/upgrade-workloads/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/workloads/upgrade-workloads/_index.md index 0a7882d990f..ef46dfc6bb1 100644 --- a/content/rancher/v2.x/en/tasks/workloads/upgrade-workloads/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/upgrade-workloads/_index.md @@ -1,6 +1,8 @@ --- title: Upgrading Workloads -weight: 125 +weight: 3028 +aliases: + - /rancher/v2.x/en/concepts/workloads/upgrade-workloads/ --- When a new version of an application image is released on Docker Hub, you can upgrade any workloads running a previous version of the application to the new one. diff --git a/content/rancher/v2.x/en/tasks/_index.md b/content/rancher/v2.x/en/tasks/_index.md deleted file mode 100644 index ae1250144c6..00000000000 --- a/content/rancher/v2.x/en/tasks/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Tutorials -weight: 3000 ---- -This section of the docs provide step-by-step instructions on how to accomplish a goal within Rancher. diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-a-node/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-a-node/_index.md deleted file mode 100644 index 22b6749fc45..00000000000 --- a/content/rancher/v2.x/en/tasks/clusters/adding-a-node/_index.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: Adding a Node -weight: 3475 -draft: true ---- -Coming Soon - -## By Node/Cloud Provider - -Coming Soon - -## By Custom - -Coming Soon 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 deleted file mode 100644 index 6bbd2ef58c9..00000000000 --- a/content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md +++ /dev/null @@ -1,97 +0,0 @@ ---- -title: Adding a Pod Security Policy -weight: 3475 ---- - -_Pod Security Policies_ are objects that control security-sensitive aspects of pod specification (like root privileges). - -You can add a Pod Security Policy (PSPs hereafter) in the following contexts: - -- [When creating a cluster](#cluster-creation--adding-a-default-pod-security-policy) -- [When editing an existing cluster](#existing-cluster--adding-a-pod-security-policy) -- [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. - -For more information about PSPs, refer to [Pod Security Policy]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies). - -## Cluster Creation: Adding a Default Pod Security Policy - -When you create a new cluster, you can configure it to apply a PSP immediately. As you create the cluster, use the **Cluster Options** to enable a PSP. The PSP assigned to the cluster will be the default PSP for projects within the cluster. - ->**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/admin-settings/pod-security-policies/). ->**Note:** ->For security purposes, we recommend assigning 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. - -When the cluster finishes provisioning, the PSP you selected is applied to all projects within the cluster. - -For detailed instruction about assigning a PSP to a new cluster, see [Creating a Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/). - -## Existing Cluster: Adding a Pod Security Policy - -If you don't apply a PSP as you create your cluster, you can always add one later. - ->**Prerequisite:** ->Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing cluster, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). - -1. From the **Global** view, find the cluster that you want to apply your PSP to. Select **Vertical Ellipsis (...) > Edit** for the cluster you want to enable PSPs for. - -2. Expand the **Cluster Options** accordion. - -3. From **Pod Security Policy Support**, select **Enabled**. - - >**Note:** Not all cluster providers support PSPs, so this option may not be available. - - **Step Result:** The **Default Pod Security Policy** drop-down activates. - -4. From **Default Pod Security Policy**, select the PSP you want to apply to the cluster. - -5. Click **Save**. - -**Result:** The PSP is applied to the cluster and any projects within the cluster. - ->**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. - -## Project Creation: Adding a Pod Security Policy - -When you create a new project, you can assign a PSP directly to the project. Assigning a PSP to a project will: - -- Override the cluster's default PSP. -- Apply the PSP to the project. -- Apply the PSP to any namespaces you add to the project later. - ->**Prerequisites:** -> -> - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to a new project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). -> - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [Existing Cluster: Adding a Pod Security Policy](#existing-cluster--adding-a-pod-security-policy). - -As you create the project, make a selection from the **Pod Security Policy** drop-down to assign a PSP. - - - -## Existing Project: Adding a Pod Security Policy - -You can always assign a PSP to an existing project if you didn't assign one during creation. - ->**Prerequisites:** -> -> - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). -> - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [Existing Cluster: Adding a Pod Security Policy](#existing-cluster--adding-a-pod-security-policy). - -1. From the **Global** view, find the cluster containing the project you want to apply a PSP to. - -1. From the main menu, select **Projects/Namespaces**. - -3. Find the project that you want to add a PSP to. From that project, select **Vertical Ellipsis (...) > Edit**. - -4. From the **Pod Security Policy** drop-down, select the PSP you want to apply to the project. - -5. Click **Save**. - -**Result:** The PSP is applied to the project and any namespaces added to the project. - ->**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-managing-cluster-members/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-managing-cluster-members/_index.md deleted file mode 100644 index 57d7b0a8c19..00000000000 --- a/content/rancher/v2.x/en/tasks/clusters/adding-managing-cluster-members/_index.md +++ /dev/null @@ -1,53 +0,0 @@ ---- -title: Adding Cluster Members -weight: 3525 ---- - -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/tasks/projects/add-project-members/) instead. - -There are two contexts where you can add cluster members: - -- [Adding Members to a New Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster) - - You can add members to a cluster as you create it (recommended if possible). - -- [Adding Members to an Existing Cluster](#adding-members-to-an-existing-cluster) - - You can always add members to a cluster later. See below. - -### Adding Members to an Existing Cluster - -Following cluster creation, you can add users as cluster members so that they can access its resources. - -1. From the **Global** view, open the cluster that you want to add members to. - -2. From the main menu, select **Members**. Then click **Add Member**. - -3. Search for the user or group that you want to add to the cluster. - - If external authentication is configured: - - - 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/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/admin-settings/rbac/#cluster-roles) - - >**Tip:** For Custom Roles, you can modify the list of individual roles available for assignment. - > - > - To add roles to the list, [Add a Custom Role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/#adding-a-custom-role). - > - To remove roles from the list, [Lock/Unlock Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/#locking-unlocking-roles). - -**Result:** The chosen users are added to the cluster. - -- To revoke cluster membership, select the user and click **Delete**. This action deletes membership, not the user. -- To modify a user's roles in the cluster, delete them from the cluster, and then re-add them with modified roles. \ No newline at end of file diff --git a/content/rancher/v2.x/en/tasks/projects/_index.md b/content/rancher/v2.x/en/tasks/projects/_index.md deleted file mode 100644 index 43214fef9d8..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Projects -weight: 3650 -draft: true ---- -_Projects_ are a new feature in Rancher that allows you to group namespaces. Users can be added as members to the project, and the project owner can assign roles to each member to control their project access. diff --git a/content/rancher/v2.x/en/tasks/projects/add-project-alerts/_index.md b/content/rancher/v2.x/en/tasks/projects/add-project-alerts/_index.md deleted file mode 100644 index 84eae19507d..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/add-project-alerts/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Adding Project Alerts -weight: -draft: true ---- -Coming Soon diff --git a/content/rancher/v2.x/en/tasks/projects/create-pod-security-policies/_index.md b/content/rancher/v2.x/en/tasks/projects/create-pod-security-policies/_index.md deleted file mode 100644 index 70308048c88..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/create-pod-security-policies/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Creating Pod Security Policies -weight: -draft: true ---- -Coming Soon diff --git a/content/rancher/v2.x/en/tasks/projects/create-project/_index.md b/content/rancher/v2.x/en/tasks/projects/create-project/_index.md deleted file mode 100644 index 8fb7c996ec6..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/create-project/_index.md +++ /dev/null @@ -1,41 +0,0 @@ ---- -title: Creating Projects -weight: ---- - -1. From the **Global** view, choose **Clusters** from the main menu. From the **Clusters** page, open the cluster from which you want to create a project. - -1. From the main menu, choose **Projects/Namespaces**. Then click **Add Project**. - -1. Enter a **Project Name**. - -1. **Optional:** Select a **Pod Security Policy**. - - [What are Pod Security Policies?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies) - - >**Note:** This option is only available if you've already created a Pod Security Policy. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/#creating-pod-security-policies). - -1. **Recommended:** Add project members. - - Use the **Members** accordion to provide other users with project access and roles. - - By default, your user is added as the project `Owner`. - - 1. Click **Add Member**. - - 1. From the **Name** combo box, search for a user or group that you want to assign project access. - - >**Note:** You can only search for groups if external authentication is enabled. - - 1. From the **Role** drop-down, choose a role. - - [What are Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#cluster-and-project-roles) - - >**Tip:** Choose Custom to create a custom role on the fly: [Custom Project Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#custom-project-roles). - - 1. To add more members, repeat substeps a—c. - - -1. Click **Create**. - -**Result:** Your project is created. You can view it from the cluster's **Projects/Namespaces** view. \ No newline at end of file diff --git a/content/rancher/v2.x/en/tasks/projects/enable-project-logging/_index.md b/content/rancher/v2.x/en/tasks/projects/enable-project-logging/_index.md deleted file mode 100644 index 0f02a92be43..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/enable-project-logging/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Enabling Project Logging -weight: -draft: true ---- -Coming Soon diff --git a/content/rancher/v2.x/en/tasks/projects/launch-a-catalog-app/_index.md b/content/rancher/v2.x/en/tasks/projects/launch-a-catalog-app/_index.md deleted file mode 100644 index 47da8f3b928..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/launch-a-catalog-app/_index.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: Launching a Catalog App -weight: -draft: true ---- -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). - -1. From the **Global** view, open the project that you want to deploy to. - -2. From the main menu, choose **Catalog Apps**. Then click **Launch**. - -3. Find the app that you want to launch, and then click **View Now**. - -4. Under **Configuration Options** enter a **Name**. By default, this name is also used to create a Kubernetes namespace for the application. - - * If you would like to change the **Namespace**, click **Customize** and enter a new name. - * If you want to use a different namespace that already exists, click **Customize**, and then click **Use an existing namespace**. Choose a namespace from the list. - -5. Select a **Template Version**. - -6. Complete the rest of the **Configuration Options**. - - * For native Helm charts (i.e., charts from the **Helm Stable** or **Helm Incubator** catalogs), answers are provided as key value pairs in the **Answers** section. - * Keys and values are available within **Detailed Descriptions**. - -7. Review the files in **Preview**. When you're satisfied, click **Launch**. - -**Result**: Your application is deployed to your chosen namespace. You can view the application status from the project's: - -- **Workloads** view -- **Catalog Apps** view diff --git a/content/rancher/v2.x/en/tasks/projects/manage-pod-security-policies/_index.md b/content/rancher/v2.x/en/tasks/projects/manage-pod-security-policies/_index.md deleted file mode 100644 index 9da1ef07f4f..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/manage-pod-security-policies/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Managing Pod Security Policies -weight: -draft: true ---- -Coming Soon diff --git a/content/rancher/v2.x/en/tasks/projects/manage-project-alerts/_index.md b/content/rancher/v2.x/en/tasks/projects/manage-project-alerts/_index.md deleted file mode 100644 index 9a2ce2dcde6..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/manage-project-alerts/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Managing Project Alerts -weight: -draft: true ---- -Coming Soon diff --git a/content/rancher/v2.x/en/tasks/projects/manage-project-logging/_index.md b/content/rancher/v2.x/en/tasks/projects/manage-project-logging/_index.md deleted file mode 100644 index 2ff795cd31f..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/manage-project-logging/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Managing Project Logging -weight: -draft: true ---- -Coming Soon diff --git a/content/rancher/v2.x/en/tasks/projects/manage-project-members/_index.md b/content/rancher/v2.x/en/tasks/projects/manage-project-members/_index.md deleted file mode 100644 index 3ca33000d8c..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/manage-project-members/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Managing Project Members -weight: -draft: true ---- -Coming Soon diff --git a/content/rancher/v2.x/en/tasks/projects/switch-project/_index.md b/content/rancher/v2.x/en/tasks/projects/switch-project/_index.md deleted file mode 100644 index f7ab9fdb8eb..00000000000 --- a/content/rancher/v2.x/en/tasks/projects/switch-project/_index.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: Switching Projects (and Clusters) -weight: -draft: true ---- - -To switch between clusters, use the **Global** drop-down available in the main menu. - -![Global Menu]({{< baseurl >}}/img/rancher/global-menu.png) - -Alternatively, you can switch between projects and clusters using the main menu. - -- To switch between clusters, open the **Global** view and select **Clusters** from the main menu. Then open a cluster. -- To switch between projects, open a cluster, and then select **Projects/Namespaces** from the main menu. Select the link for the project that you want to open. \ No newline at end of file diff --git a/content/rancher/v2.x/en/tasks/workloads/_index.md b/content/rancher/v2.x/en/tasks/workloads/_index.md deleted file mode 100644 index 9f174b46aca..00000000000 --- a/content/rancher/v2.x/en/tasks/workloads/_index.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: Workloads -weight: 3675 ---- - -This section of the documentation contains instructions for deploying workloads and using workload options. - -- [Deploy Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/) -- [Upgrade Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/upgrade-workloads/) -- [Rollback Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/rollback-workloads/) From 8fb852ec9766bbc314b4c60ba55c94e03dbd46fa Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Tue, 17 Jul 2018 10:15:20 -0700 Subject: [PATCH 3/9] fixing any "tasks" links --- .../customizing-charts/_index.md | 2 +- .../enabling-default-catalogs/_index.md | 2 +- content/rancher/v2.x/en/cli/_index.md | 2 +- .../v2.x/en/clusters/cluster-members/_index.md | 12 ++++++------ .../rke-clusters/options/cloud-providers/_index.md | 4 ---- .../options/pod-security-policies/_index.md | 14 +------------- .../kubernetes-in-rancher/certificates/_index.md | 2 +- .../en/kubernetes-in-rancher/configmaps/_index.md | 2 +- .../load-balancing/_index.md | 1 - .../en/kubernetes-in-rancher/registries/_index.md | 2 +- .../en/kubernetes-in-rancher/secrets/_index.md | 2 +- .../volumes-and-storage/_index.md | 4 ++-- .../volumes-and-storage/examples/nfs/_index.md | 4 ++-- .../persistent-volume-claim/_index.md | 2 +- .../en/kubernetes-in-rancher/workloads/_index.md | 6 +++--- .../workloads/deploy-workloads/_index.md | 4 ++-- 16 files changed, 24 insertions(+), 41 deletions(-) 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 a72c0eb5ab4..2235f847845 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 @@ -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/tasks/projects/launch-a-catalog-app). +Launch your custom catalog app. For more information, see [Launching a Catalog App]({{< baseurl >}}/rancher/v2.x/en/catalog-and-charts/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-and-charts/enabling-default-catalogs/_index.md index d0c1b1c6f90..120168cb5e1 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 @@ -20,4 +20,4 @@ Out-of-the-box, you can enable several different catalog repositories to simplif ## What's Next? -Deploy catalog applications to your cluster nodes. For more information, see [Launching a Catalog App]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/launch-a-catalog-app). +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). diff --git a/content/rancher/v2.x/en/cli/_index.md b/content/rancher/v2.x/en/cli/_index.md index c8876b2e9b4..80f8378f309 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/tasks/global-configuration/server-url), which is used to connect to Rancher Server. +- Your [Rancher Server URL]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rancher-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 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 9f51ec378a2..0317a42c865 100644 --- a/content/rancher/v2.x/en/clusters/cluster-members/_index.md +++ b/content/rancher/v2.x/en/clusters/cluster-members/_index.md @@ -7,15 +7,15 @@ 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/tasks/projects/add-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-namespaces/project-members/) instead. There are two contexts where you can add cluster members: -- [Adding Members to a New Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster) +- Adding Members to a New Cluster You can add members to a cluster as you create it (recommended if possible). -- [Adding Members to an Existing Cluster](#adding-members-to-an-existing-cluster) +- [Adding Members to an Existing Cluster](/tasks/#adding-members-to-an-existing-cluster) You can always add members to a cluster later. See below. @@ -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/concepts/global-configuration/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/tasks/global-configuration/authentication/active-directory/). + >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. @@ -46,8 +46,8 @@ Following cluster creation, you can add users as cluster members so that they ca >**Tip:** For Custom Roles, you can modify the list of individual roles available for assignment. > - > - To add roles to the list, [Add a Custom Role]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/roles/#adding-a-custom-role). - > - To remove roles from the list, [Lock/Unlock Roles]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/roles/#locking-unlocking-roles). + > - To add roles to the list, [Add a Custom Role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/). + > - To remove roles from the list, [Lock/Unlock Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/#locking-unlocking-roles). **Result:** The chosen users are added to the cluster. diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/options/cloud-providers/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/options/cloud-providers/_index.md index f3c49a530a0..49d06cabba7 100644 --- a/content/rancher/v2.x/en/clusters/rke-clusters/options/cloud-providers/_index.md +++ b/content/rancher/v2.x/en/clusters/rke-clusters/options/cloud-providers/_index.md @@ -164,7 +164,3 @@ Only hosts expected to be Load Balancer backends need to be in this group. ### External Links - [Cloud Providers](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/) - -### Tutorials - -- [Creating a Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/) diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md index 82e3da30dae..ac539555eab 100644 --- a/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md +++ b/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md @@ -3,21 +3,9 @@ title: Pod Security Policies weight: 2260 --- - _Pod Security Policies_ are objects that control security-sensitive aspects of pod specification (like root privileges). -You can add a Pod Security Policy (PSPs hereafter) in the following contexts: - -- [When creating a cluster](#cluster-creation--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](#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. - -For more information about PSPs, refer to [Pod Security Policy]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies). - -## Cluster Creation: Adding a Default Pod Security Policy +## Adding a Default Pod Security Policy When you create a new cluster, you can configure it to apply a PSP immediately. As you create the cluster, use the **Cluster Options** to enable a PSP. The PSP assigned to the cluster will be the default PSP for projects within the cluster. diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/certificates/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/certificates/_index.md index 993e56f5799..aa076321b99 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/certificates/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/certificates/_index.md @@ -41,4 +41,4 @@ Add SSL certificates to either projects, namespaces, or both. A project scoped c ## What's Next? -Now you can add the certificate when launching an ingress within the current project or namespace. For more information, see [Adding Ingress]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/add-ingress/). +Now you can add the certificate when launching an ingress within the current project or namespace. For more information, see [Adding Ingress]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/ingress/). diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/configmaps/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/configmaps/_index.md index ba7049d6da7..3cddf3c1b31 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/configmaps/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/configmaps/_index.md @@ -45,4 +45,4 @@ Now that you have a ConfigMap added to a namespace, you can add it to a workload - Application environment variables. - Specifying parameters for a Volume mounted to the workload. -For more information on adding ConfigMaps to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/). +For more information on adding ConfigMaps to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/). diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/load-balancing/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/load-balancing/_index.md index d994204605e..72b14169b08 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/load-balancing/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/load-balancing-and-ingress/load-balancing/_index.md @@ -70,4 +70,3 @@ The benefit of using xip.io is that you obtain a working entrypoint URL immediat ### Ingress Controller - [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/#what-is-ingress) - diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/registries/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/registries/_index.md index bd60189f703..e602689f2a7 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/registries/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/registries/_index.md @@ -35,4 +35,4 @@ Registries are secrets containing credentials used to authenticate with [private Now that you have a registry added to the project or namespace, you can add it to a workload that's deploying an image from your private registry. -For more information on adding a registry to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/). +For more information on adding a registry to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/). diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/secrets/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/secrets/_index.md index aadd08f68ac..dd92fdec569 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/secrets/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/secrets/_index.md @@ -38,4 +38,4 @@ When creating a secret, you can make it available for any deployment within a pr Now that you have a secret added to the project or namespace, you can add it to a workload that you deploy. -For more information on adding secret to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/). +For more information on adding secret to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/). diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md index e92694c5e1c..5d0d11c3b42 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md @@ -57,5 +57,5 @@ Finally, you can define custom `MountOptions` for the persistent volume created. ### Tutorials -- [Adding Storage]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage) -- [Adding Persistent Volume Claims]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim) +- [Adding Storage]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/) +- [Adding Persistent Volume Claims]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim) diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md index 5ec977c7b74..7eb90386e39 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md @@ -9,7 +9,7 @@ Before you can use the NFS storage volume plug-in with Rancher deployments, you >**Note:** > ->- If you already have an NFS share, you don't need to provision a new NFS server to use the NFS volume plugin within Rancher. Instead, skip the rest of this procedure and complete [adding storage]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/). +>- If you already have an NFS share, you don't need to provision a new NFS server to use the NFS volume plugin within Rancher. Instead, skip the rest of this procedure and complete [adding storage]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/). > >- This procedure demonstrates how to setup an NFS server using Ubuntu, although you should be able to use these instructions for other Linux distros (e.g. Debian, RHEL, Arch Linux, etc.). For official instruction on how to create an NFS server using another Linux distro, consult the distro's documentation. @@ -65,4 +65,4 @@ Before you can use the NFS storage volume plug-in with Rancher deployments, you ## What's Next? -Within Rancher, add the NFS server as a [storage volume]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/#adding-a-persistent-volume) and/or [storage class]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/#adding-storage-classes). After adding the server, you can use it for storage for your deployments. +Within Rancher, add the NFS server as a [storage volume]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/#adding-a-persistent-volume) and/or [storage class]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/#adding-storage-classes). After adding the server, you can use it for storage for your deployments. diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md index 709e9504ddd..259c29b49df 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md @@ -12,7 +12,7 @@ _Persistent Volume Claims_ (or PVCs) are objects that request storage resources - Each Rancher project contains a list of PVCs that you've created, available from the **Volumes** tab. You can reuse these PVCs when creating deployments in the future. >**Prerequisite:** -> You must have a pre-provisioned [persistent volume]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/#adding-a-persistent-volume) available for use, or you must have a [storage class created]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/#adding-storage-classes) that dynamically creates a volume upon request from the workload. +> You must have a pre-provisioned [persistent volume]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/#adding-a-persistent-volume) available for use, or you must have a [storage class created]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/#adding-storage-classes) that dynamically creates a volume upon request from the workload. 1. From the **Global** view, open the project containing a workload that you want to add a PVC to. diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/_index.md index c4ad6632002..deed2bde4a7 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/workloads/_index.md @@ -70,9 +70,9 @@ There are several types of services available in Rancher. The descriptions below This section of the documentation contains instructions for deploying workloads and using workload options. - - [Deploy Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/) - - [Upgrade Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/upgrade-workloads/) - - [Rollback Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/rollback-workloads/) + - [Deploy Workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/) + - [Upgrade Workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/upgrade-workloads/) + - [Rollback Workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/rollback-workloads/) ## Related Links 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 0f799a9a42d..92e81039598 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 @@ -25,13 +25,13 @@ Deploy a workload to run an application in one or more containers. - **Environment Variables** - 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/). + 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/kubernetes-in-rancher/configmaps/). - **Node Scheduling** - **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/). + 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/kubernetes-in-rancher/configmaps/). - **Scaling/Upgrade Policy** From 3bcab69a9152970876487a780e15ae9da11e99bd Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Tue, 17 Jul 2018 10:16:28 -0700 Subject: [PATCH 4/9] moving psp stuff to editing clusters --- .../options/pod-security-policies/_index.md | 67 ------------------- 1 file changed, 67 deletions(-) diff --git a/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md b/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md index ac539555eab..c7484956135 100644 --- a/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md +++ b/content/rancher/v2.x/en/clusters/rke-clusters/options/pod-security-policies/_index.md @@ -17,70 +17,3 @@ When you create a new cluster, you can configure it to apply a PSP immediately. 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. When the cluster finishes provisioning, the PSP you selected is applied to all projects within the cluster. - -For detailed instruction about assigning a PSP to a new cluster, see [Creating a Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/). - -## Existing Cluster: Adding a Pod Security Policy - -If you don't apply a PSP as you create your cluster, you can always add one later. - ->**Prerequisite:** ->Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing cluster, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). - -1. From the **Global** view, find the cluster that you want to apply your PSP to. Select **Vertical Ellipsis (...) > Edit** for the cluster you want to enable PSPs for. - -2. Expand the **Cluster Options** accordion. - -3. From **Pod Security Policy Support**, select **Enabled**. - - >**Note:** Not all cluster providers support PSPs, so this option may not be available. - - **Step Result:** The **Default Pod Security Policy** drop-down activates. - -4. From **Default Pod Security Policy**, select the PSP you want to apply to the cluster. - -5. Click **Save**. - -**Result:** The PSP is applied to the cluster and any projects within the cluster. - ->**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. - -## Project Creation: Adding a Pod Security Policy - -When you create a new project, you can assign a PSP directly to the project. Assigning a PSP to a project will: - -- Override the cluster's default PSP. -- Apply the PSP to the project. -- Apply the PSP to any namespaces you add to the project later. - ->**Prerequisites:** -> -> - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to a new project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). -> - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [Existing Cluster: Adding a Pod Security Policy](#existing-cluster--adding-a-pod-security-policy). - -As you create the project, make a selection from the **Pod Security Policy** drop-down to assign a PSP. - - - -## Existing Project: Adding a Pod Security Policy - -You can always assign a PSP to an existing project if you didn't assign one during creation. - ->**Prerequisites:** -> -> - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). -> - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [Existing Cluster: Adding a Pod Security Policy](#existing-cluster--adding-a-pod-security-policy). - -1. From the **Global** view, find the cluster containing the project you want to apply a PSP to. - -1. From the main menu, select **Projects/Namespaces**. - -3. Find the project that you want to add a PSP to. From that project, select **Vertical Ellipsis (...) > Edit**. - -4. From the **Pod Security Policy** drop-down, select the PSP you want to apply to the project. - -5. Click **Save**. - -**Result:** The PSP is applied to the project and any namespaces added to the project. - ->**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. From 1498e31797a48bdab816fbf96ba90b796ca92fe2 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Tue, 17 Jul 2018 10:29:28 -0700 Subject: [PATCH 5/9] fixing concepts links --- .../v2.x/en/admin-settings/rbac/_index.md | 3 +-- .../adding-custom-catalogs/_index.md | 2 +- .../customizing-charts/_index.md | 4 ++-- .../enabling-default-catalogs/_index.md | 2 +- .../launching-catalog-apps/_index.md | 2 +- content/rancher/v2.x/en/cli/_index.md | 16 ++++++++-------- .../v2.x/en/clusters/cluster-members/_index.md | 6 +++--- .../clusters/rke-clusters/node-pools/_index.md | 4 ++-- .../v2.x/en/kubernetes-in-rancher/_index.md | 4 ++-- .../workloads/deploy-workloads/_index.md | 4 ++-- 10 files changed, 23 insertions(+), 24 deletions(-) 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: From 201e0f9e01c5d1d942faebb2d727883717943228 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Tue, 17 Jul 2018 10:59:35 -0700 Subject: [PATCH 6/9] 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: From febfd723c611d881d6cd69a54b9ecbf0ed32cee6 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Tue, 17 Jul 2018 14:14:56 -0700 Subject: [PATCH 7/9] updating rbac and catalogs --- .../admin-settings/authentication/_index.md | 7 +- .../authentication/ad/_index.md | 2 +- .../authentication/azure-ad/_index.md | 2 +- .../authentication/freeipa/_index.md | 2 +- .../authentication/github/_index.md | 2 +- .../authentication/local/_index.md | 4 +- .../authentication/openldap/_index.md | 2 +- .../pod-security-policies/_index.md | 2 +- .../v2.x/en/admin-settings/rbac/_index.md | 178 +-------------- .../rbac/cluster-project-roles/_index.md | 97 +++++++++ .../_index.md | 28 +-- .../rbac/global-permissions/_index.md | 54 +++++ .../rbac/locked-roles/_index.md | 37 ++++ .../en/admin-settings/server-url/_index.md | 2 +- content/rancher/v2.x/en/catalog/_index.md | 168 ++++---------- .../v2.x/en/catalog/custom-catalogs/_index.md | 32 --- .../v2.x/en/catalog/custom-charts/_index.md | 110 ---------- .../rancher/v2.x/en/catalog/custom/_index.md | 206 ++++++++++++++++++ .../enabling-default-catalogs/_index.md | 23 -- .../catalog/launching-catalog-apps/_index.md | 33 --- .../cluster-members/_index.md | 2 +- .../rke-clusters/node-pools/_index.md | 4 +- .../creating-and-managing-projects/_index.md | 11 +- .../project-members/_index.md | 2 +- .../_index.md | 2 +- 25 files changed, 476 insertions(+), 536 deletions(-) create mode 100644 content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md rename content/rancher/v2.x/en/admin-settings/rbac/{creating-roles => default-custom-roles}/_index.md (61%) create mode 100644 content/rancher/v2.x/en/admin-settings/rbac/global-permissions/_index.md create mode 100644 content/rancher/v2.x/en/admin-settings/rbac/locked-roles/_index.md delete mode 100644 content/rancher/v2.x/en/catalog/custom-catalogs/_index.md delete mode 100644 content/rancher/v2.x/en/catalog/custom-charts/_index.md create mode 100644 content/rancher/v2.x/en/catalog/custom/_index.md delete mode 100644 content/rancher/v2.x/en/catalog/enabling-default-catalogs/_index.md delete mode 100644 content/rancher/v2.x/en/catalog/launching-catalog-apps/_index.md diff --git a/content/rancher/v2.x/en/admin-settings/authentication/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/_index.md index 3471e124701..3e188def25c 100644 --- a/content/rancher/v2.x/en/admin-settings/authentication/_index.md +++ b/content/rancher/v2.x/en/admin-settings/authentication/_index.md @@ -1,6 +1,6 @@ --- title: Authentication -weight: 50 +weight: 1110 aliases: -/rancher/v2.x/en/concepts/global-configuration/authentication/ -/rancher/v2.x/en/tasks/global-configuration/authentication/ @@ -26,8 +26,6 @@ However, Rancher also provides local authentication. In most cases, you should use an external authentication service over local, as external authentication allows user management from a central location. However, you may want a few local authentication users for managing Rancher under rare circumstances, such as if Active Directory is down. -For more information on how to configure external authentication or local authentication, see [Authentication](../../../tasks/global-configuration/authentication/). - ### External Authentication Configuration and Principal Users Configuration of external authentication requires: @@ -53,9 +51,8 @@ Configuration of external authentication affects how principal users are managed ![Sign In External Principal]({{< baseurl >}}/img/rancher/sign-in-external.png) -5. Because the external principal and the local principal share an ID, no unique object for the external principal displays on the Users page. +5. Because the external principal and the local principal share an ID, no unique object for the external principal displays on the Users page. ![Sign In External Principal]({{< baseurl >}}/img/rancher/users-page.png) 6. The external principal and the local principal share the same access rights. - diff --git a/content/rancher/v2.x/en/admin-settings/authentication/ad/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/ad/_index.md index 024b18ff2a1..af36a4895e9 100644 --- a/content/rancher/v2.x/en/admin-settings/authentication/ad/_index.md +++ b/content/rancher/v2.x/en/admin-settings/authentication/ad/_index.md @@ -1,6 +1,6 @@ --- title: Configuring Active Directory (AD) -weight: 50 +weight: 1112 aliases: -/rancher/v2.x/en/tasks/global-configuration/authentication/active-directory/ --- diff --git a/content/rancher/v2.x/en/admin-settings/authentication/azure-ad/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/azure-ad/_index.md index c2bac9fabe5..b9f10fe60b4 100644 --- a/content/rancher/v2.x/en/admin-settings/authentication/azure-ad/_index.md +++ b/content/rancher/v2.x/en/admin-settings/authentication/azure-ad/_index.md @@ -1,6 +1,6 @@ --- title: Configuring Azure AD -weight: 75 +weight: 1115 aliases: -/rancher/v2.x/en/tasks/global-configuration/authentication/azure-ad/ --- diff --git a/content/rancher/v2.x/en/admin-settings/authentication/freeipa/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/freeipa/_index.md index 6fb0afa428a..47aa91c35af 100644 --- a/content/rancher/v2.x/en/admin-settings/authentication/freeipa/_index.md +++ b/content/rancher/v2.x/en/admin-settings/authentication/freeipa/_index.md @@ -1,6 +1,6 @@ --- title: Configuring FreeIPA -weight: 150 +weight: 1114 aliases: -/rancher/v2.x/en/tasks/global-configuration/authentication/freeipa/ --- diff --git a/content/rancher/v2.x/en/admin-settings/authentication/github/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/github/_index.md index 271f45e3627..2c532cfe686 100644 --- a/content/rancher/v2.x/en/admin-settings/authentication/github/_index.md +++ b/content/rancher/v2.x/en/admin-settings/authentication/github/_index.md @@ -1,6 +1,6 @@ --- title: Configuring GitHub -weight: 100 +weight: 1116 aliases: -/rancher/v2.x/en/tasks/global-configuration/authentication/github/ --- diff --git a/content/rancher/v2.x/en/admin-settings/authentication/local/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/local/_index.md index e65390436cf..a4d4214ae56 100644 --- a/content/rancher/v2.x/en/admin-settings/authentication/local/_index.md +++ b/content/rancher/v2.x/en/admin-settings/authentication/local/_index.md @@ -1,6 +1,6 @@ --- title: Configuring Local Authentication -weight: 25 +weight: 1111 aliases: -/rancher/v2.x/en/tasks/global-configuration/authentication/local-authentication/ --- @@ -9,4 +9,4 @@ Regardless of whether you use external authentication, you should create a few l 1. From the **Global** view, select **Users** from the main menu. -2. Click **Add User**. Then complete the **Add User** form. Click **Create** when you're done. \ No newline at end of file +2. Click **Add User**. Then complete the **Add User** form. Click **Create** when you're done. diff --git a/content/rancher/v2.x/en/admin-settings/authentication/openldap/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/openldap/_index.md index b442a5f1a82..b1699d6180f 100644 --- a/content/rancher/v2.x/en/admin-settings/authentication/openldap/_index.md +++ b/content/rancher/v2.x/en/admin-settings/authentication/openldap/_index.md @@ -1,6 +1,6 @@ --- title: Configuring OpenLDAP -weight: 125 +weight: 1113 aliases: -/rancher/v2.x/en/tasks/global-configuration/authentication/openLDAP/ --- 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 cf1832e5ac6..d95f23280e3 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 @@ -1,6 +1,6 @@ --- title: Pod Security Policies -weight: 100 +weight: 1135 aliases: -/rancher/v2.x/en/concepts/global-configuration/pod-security-policies -/rancher/v2.x/en/tasks/global-configuration/pod-security-policies 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 63add288f9b..878ab281358 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/_index.md @@ -1,6 +1,6 @@ --- -title: RBAC -weight: 75 +title: Roles in Rancher +weight: 1125 aliases: -/rancher/v2.x/en/admin-settings/rbac/ --- @@ -17,182 +17,12 @@ After you configure external authentication, the users that display on the **Use Once the user logs in to Rancher, their _authorization_, or their access rights within the system, is determined by _global permissions_, and _cluster and project roles_. -- **Global Permissions:** +- **[Global Permissions]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/global-permissions/):** Define user authorization outside the scope of any particular cluster. -- **Cluster and Project Roles:** +- **[Cluster and Project Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/):** Define user authorization inside the specific cluster or project where they are assigned the role. Both global permissions and cluster and project roles are implemented on top of [Kubernetes RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rbac/). Therefore, enforcement of permissions and roles is performed by Kubernetes. - -### Global Permissions - -Global Permissions define user authorization outside the scope of any particular cluster. Out-of-the-box, there are two default global permissions: `Administrator` and `Standard User`. - -- **Administrator:** - - These users have full control over the entire Rancher system and all clusters within it. - -- **Standard User:** - - These users can create new clusters and use them. Standard users can also assign other users permissions to their clusters. - ->**Note:** You cannot create, update, or delete Global Permissions. - -#### Global Permission Assignment - -Assignment of global permissions to a user depends on their authentication source: external or local. - -- **External Authentication** - - When a user logs into Rancher using an external authentication provider for the first time, they are automatically assigned the `Standard User` global permission. - -- **Local Authentication** - - When you create a new local user, you assign them a global permission as you complete the **Add User** form. - -#### Custom Global Permissions - -Rather than assigning users the default global permissions of `Administrator` or `Standard User`, you can assign them a custom set of permissions. - -_Permissions_ are individual access rights that you can assign when selecting a custom permission for a user. - -Using custom permissions is convenient for providing users with narrow or specialized access to Rancher. See the [table below](#global-permissions-reference) for a list of individual permissions available. - -#### Global Permissions Reference - -The following table lists each custom global permission available and whether it is assigned to the default global permissions, `Administrator` and `Standard User`. - -| Custom Global Permission | Administrator | Standard User | -| ---------------------------------- | ------------- | ------------- | -| Manage Authentication | ✓ | | -| Manage Catalogs | ✓ | | -| Manage Node Drivers | ✓ | | -| Manage PodSecurityPolicy Templates | ✓ | | -| Manage Roles | ✓ | | -| Manage Users | ✓ | | -| Create Clusters | ✓ | ✓ | -| User Catalog Templates | ✓ | ✓ | -| Login Access | ✓ | ✓ | - -> **Note:** Each permission listed above is comprised of multiple individual permissions not listed in the Rancher UI. For a full list of these permissions and the rules they are comprised of, access through the API at `/v3/globalroles`. - -### Cluster and Project Roles - -Cluster and project roles define user authorization inside a cluster or project. You can manage these roles from the **Global > Security > Roles** page. From this page you can: - -- Create and manage new roles for use across all clusters and projects -- [Lock/unlock roles](#locked-roles) so that they may not be used in any new role assignments (existing assignments will still be enforced). - - -#### Membership and Role Assignment - -The projects and clusters accessible to non-administrative users is determined by _membership_. Membership is a list of users who have access to a specific cluster or project based on the roles they were assigned in that cluster or project. Each cluster and project includes a tab that a user with the appropriate permissions can use to manage membership. - -When you create a cluster or project, Rancher automatically assigns you as the `Owner` for it. Users assigned the `Owner` role can assign other users roles in the cluster or project. - -> **Note:** Non-administrative users cannot access any existing projects/clusters by default. A user with appropriate permissions (typically the owner) must explicitly assign the user membership. - -#### Cluster Roles - -_Cluster roles_ are roles that you can assign to users, granting them access to a cluster. There are two primary cluster roles: `Owner` and `Member`. - -- **Owner:** - - These users have full control over the cluster and all resources in it. - -- **Member:** - - These users can view most cluster level resources and create new projects. - -##### Custom Cluster Roles - -Rancher lets you assign _custom cluster roles_ to a user instead of the typical `Owner` or `Member` roles. These roles can be either a built-in custom cluster role or one defined by a Rancher administrator. They are convenient for defining narrow or specialized access for a user within a cluster. See the table below for a list of built-in custom cluster roles. - -##### Cluster Role Reference - -The following table lists each built-in custom cluster role available in Rancher and whether it is also granted by the `Owner` or `Member` role. - -| Custom Cluster Role | Owner | Member | -| ---------------------------------- | ------------- | ------------- | -| Manage Cluster Members | ✓ | | -| Manage Nodes | ✓ | | -| Manage Storage | ✓ | | -| View All Projects | ✓ | | -| Create Project | ✓ | ✓ | -| View Cluster Members | ✓ | ✓ | -| View Nodes | ✓ | ✓ | - -> **Note:** Each cluster role listed above, including `Owner` and `Member`, is comprised of multiple rules granting access to various resources. You can view the roles and their rules on the Global > Security > Roles page. - -#### Project Roles - -_Project roles_ are roles that can be used to grant users access to a project. There are three primary project roles: `Owner`, `Member`, and `Read Only`. - -- **Owner:** - - These users have full control over the project and all resources in it. - -- **Member:** - - These users can manage project-scoped resources like namespaces and workloads, but cannot manage other project members. - -- **Read Only:** - - These users can view everything in the project but cannot create, update, or delete anything. - -##### Custom Project Roles - -Rancher lets you assign _custom project roles_ to a user instead of the typical `Owner`, `Member`, or `Read Only` roles. These roles can be either a built-in custom project role or one defined by a Rancher administrator. They are convenient for defining narrow or specialized access for a user within a project. See the table below for a list of built-in custom project roles. - -##### Project Role Reference - -The following table lists each built-in custom project role available in Rancher and whether it is also granted by the `Owner`, `Member`, or `Read Only` role. - -| Custom Cluster Role | Owner | Member | Read Only | -| ---------------------------------- | ------------- | ------------- | ------------- | -| Manage Project Members | ✓ | | | -| Create Namespaces | ✓ | ✓ | | -| Manage Config Maps | ✓ | ✓ | | -| Manage Ingress | ✓ | ✓ | | -| Manage Secrets | ✓ | ✓ | | -| Manage Service Accounts | ✓ | ✓ | | -| Manage Services | ✓ | ✓ | | -| Manage Volumes | ✓ | ✓ | | -| Manage Workloads | ✓ | ✓ | | -| View Config Maps | ✓ | ✓ | ✓ | -| View Ingress | ✓ | ✓ | ✓ | -| View Project Members | ✓ | ✓ | ✓ | -| View Secrets | ✓ | ✓ | ✓ | -| View Service Accounts | ✓ | ✓ | ✓ | -| View Services | ✓ | ✓ | ✓ | -| View Volumes | ✓ | ✓ | ✓ | -| View Workloads | ✓ | ✓ | ✓ | - -> **Note:** Each project role listed above, including Owner, Member, and Read Only, is comprised of multiple rules granting access to various resources. You can view the roles and their rules on the Global > Security > Roles page. - -### Defining Custom Roles -As previously mentioned, custom roles can be defined for use at the cluster or project level. The context field defines whether the role will appear on the cluster member page, project member page, or both. - -When defining a custom role, you can grant access to specific resources or specify roles from which the custom role should inherit. A custom role can be made up of a combination of specific grants and inherited roles. All grants are additive. This means that defining a narrower grant for a specific resource **will not** override a broader grant defined in a role that the custom role is inheriting from. - -#### Locked Roles - -You can set roles to a status of `locked`. Locking roles prevent them from being assigned users in the future. - -Locked roles: - -- Cannot be assigned to users that don't already have it assigned. -- Are not listed in the **Member Roles** drop-down when you are adding a user to a cluster or project. -- Do not affect users assigned the role before you lock the role. These users retain access that the role provides. - - **Example:** let's say your organization creates an internal policy that users assigned to a cluster are prohibited from creating new projects. It's your job to enforce this policy. - - To enforce it, before you add new users to the cluster, you should lock the following roles: `Cluster Owner`, `Cluster Member`, and `Create Projects`. Then you could create a new custom role that includes the same permissions as a __Cluster Member__, except the ability to create projects. Then, you use this new custom role when adding users to a cluster. - -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/admin-settings/rbac/cluster-project-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md new file mode 100644 index 00000000000..6f742877568 --- /dev/null +++ b/content/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/_index.md @@ -0,0 +1,97 @@ +--- +title: Cluster and Project Roles +weight: 1127 +--- + +Cluster and project roles define user authorization inside a cluster or project. You can manage these roles from the **Global > Security > Roles** page. + +### Membership and Role Assignment + +The projects and clusters accessible to non-administrative users is determined by _membership_. Membership is a list of users who have access to a specific cluster or project based on the roles they were assigned in that cluster or project. Each cluster and project includes a tab that a user with the appropriate permissions can use to manage membership. + +When you create a cluster or project, Rancher automatically assigns you as the `Owner` for it. Users assigned the `Owner` role can assign other users roles in the cluster or project. + +> **Note:** Non-administrative users cannot access any existing projects/clusters by default. A user with appropriate permissions (typically the owner) must explicitly assign the user membership. + +### Cluster Roles + +_Cluster roles_ are roles that you can assign to users, granting them access to a cluster. There are two primary cluster roles: `Owner` and `Member`. + +- **Owner:** + + These users have full control over the cluster and all resources in it. + +- **Member:** + + These users can view most cluster level resources and create new projects. + +#### Custom Cluster Roles + +Rancher lets you assign _custom cluster roles_ to a user instead of the typical `Owner` or `Member` roles. These roles can be either a built-in custom cluster role or one defined by a Rancher administrator. They are convenient for defining narrow or specialized access for a user within a cluster. See the table below for a list of built-in custom cluster roles. + +#### Cluster Role Reference + +The following table lists each built-in custom cluster role available in Rancher and whether it is also granted by the `Owner` or `Member` role. + +| Custom Cluster Role | Owner | Member | +| ---------------------------------- | ------------- | ------------- | +| Manage Cluster Members | ✓ | | +| Manage Nodes | ✓ | | +| Manage Storage | ✓ | | +| View All Projects | ✓ | | +| Create Project | ✓ | ✓ | +| View Cluster Members | ✓ | ✓ | +| View Nodes | ✓ | ✓ | + +> **Note:** Each cluster role listed above, including `Owner` and `Member`, is comprised of multiple rules granting access to various resources. You can view the roles and their rules on the Global > Security > Roles page. + +### Project Roles + +_Project roles_ are roles that can be used to grant users access to a project. There are three primary project roles: `Owner`, `Member`, and `Read Only`. + +- **Owner:** + + These users have full control over the project and all resources in it. + +- **Member:** + + These users can manage project-scoped resources like namespaces and workloads, but cannot manage other project members. + +- **Read Only:** + + These users can view everything in the project but cannot create, update, or delete anything. + +#### Custom Project Roles + +Rancher lets you assign _custom project roles_ to a user instead of the typical `Owner`, `Member`, or `Read Only` roles. These roles can be either a built-in custom project role or one defined by a Rancher administrator. They are convenient for defining narrow or specialized access for a user within a project. See the table below for a list of built-in custom project roles. + +#### Project Role Reference + +The following table lists each built-in custom project role available in Rancher and whether it is also granted by the `Owner`, `Member`, or `Read Only` role. + +| Custom Cluster Role | Owner | Member | Read Only | +| ---------------------------------- | ------------- | ------------- | ------------- | +| Manage Project Members | ✓ | | | +| Create Namespaces | ✓ | ✓ | | +| Manage Config Maps | ✓ | ✓ | | +| Manage Ingress | ✓ | ✓ | | +| Manage Secrets | ✓ | ✓ | | +| Manage Service Accounts | ✓ | ✓ | | +| Manage Services | ✓ | ✓ | | +| Manage Volumes | ✓ | ✓ | | +| Manage Workloads | ✓ | ✓ | | +| View Config Maps | ✓ | ✓ | ✓ | +| View Ingress | ✓ | ✓ | ✓ | +| View Project Members | ✓ | ✓ | ✓ | +| View Secrets | ✓ | ✓ | ✓ | +| View Service Accounts | ✓ | ✓ | ✓ | +| View Services | ✓ | ✓ | ✓ | +| View Volumes | ✓ | ✓ | ✓ | +| View Workloads | ✓ | ✓ | ✓ | + +> **Note:** Each project role listed above, including Owner, Member, and Read Only, is comprised of multiple rules granting access to various resources. You can view the roles and their rules on the Global > Security > Roles page. + +### Defining Custom Roles +As previously mentioned, custom roles can be defined for use at the cluster or project level. The context field defines whether the role will appear on the cluster member page, project member page, or both. + +When defining a custom role, you can grant access to specific resources or specify roles from which the custom role should inherit. A custom role can be made up of a combination of specific grants and inherited roles. All grants are additive. This means that defining a narrower grant for a specific resource **will not** override a broader grant defined in a role that the custom role is inheriting from. diff --git a/content/rancher/v2.x/en/admin-settings/rbac/creating-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md similarity index 61% rename from content/rancher/v2.x/en/admin-settings/rbac/creating-roles/_index.md rename to content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md index 13defa7d559..333066493d8 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/creating-roles/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/_index.md @@ -1,6 +1,6 @@ --- -title: Creating Roles -weight: 25 +title: Custom Roles +weight: 1128 aliases: -/rancher/v2.x/en/tasks/global-configuration/roles/ --- @@ -13,12 +13,12 @@ Note that _roles_ are different from _permissions_, which determine what cluster > >To complete the tasks on this page, the following permissions are required: > ->- [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 Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#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/global-permissions/#custom-global-permissions) with the [Manage Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/global-permissions/#global-permissions-reference) role assigned. ## Adding A Custom Role -While Rancher comes out-of-the-box with a set of default user roles, you can also create custom roles to provide users with very specific permissions within Rancher. +While Rancher comes out-of-the-box with a set of default user roles, you can also create default custom roles to provide users with very specific permissions within Rancher. 1. From the **Global** view, select **Security > Roles** from the main menu. @@ -26,7 +26,7 @@ While Rancher comes out-of-the-box with a set of default user roles, you can als 3. **Name** the role. -4. Choose whether to set the role to a status of [locked]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#locked-roles). +4. Choose whether to set the role to a status of [locked]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/locked-roles/). Locked roles cannot be assigned to users. @@ -51,19 +51,3 @@ While Rancher comes out-of-the-box with a set of default user roles, you can als 7. Use the **Inherit from a Role** options to assign individual Rancher roles to your custom roles. 8. Click **Create**. - -## 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/admin-settings/rbac/#locked-roles). - -You can lock roles in two contexts: - -- When you're [adding a custom role](#adding-a-custom-role). -- When you editing an existing role (see below). - - -1. From the **Global** view, select **Security** > **Roles**. - -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**. diff --git a/content/rancher/v2.x/en/admin-settings/rbac/global-permissions/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/global-permissions/_index.md new file mode 100644 index 00000000000..931993237c2 --- /dev/null +++ b/content/rancher/v2.x/en/admin-settings/rbac/global-permissions/_index.md @@ -0,0 +1,54 @@ +--- +title: Global Permissions +weight: 1126 +--- + +Global Permissions define user authorization outside the scope of any particular cluster. Out-of-the-box, there are two default global permissions: `Administrator` and `Standard User`. + +- **Administrator:** + + These users have full control over the entire Rancher system and all clusters within it. + +- **Standard User:** + + These users can create new clusters and use them. Standard users can also assign other users permissions to their clusters. + +>**Note:** You cannot create, update, or delete Global Permissions. + +### Global Permission Assignment + +Assignment of global permissions to a user depends on their authentication source: external or local. + +- **External Authentication** + + When a user logs into Rancher using an external authentication provider for the first time, they are automatically assigned the `Standard User` global permission. + +- **Local Authentication** + + When you create a new local user, you assign them a global permission as you complete the **Add User** form. + +### Custom Global Permissions + +Rather than assigning users the default global permissions of `Administrator` or `Standard User`, you can assign them a custom set of permissions. + +_Permissions_ are individual access rights that you can assign when selecting a custom permission for a user. + +Using custom permissions is convenient for providing users with narrow or specialized access to Rancher. See the [table below](#global-permissions-reference) for a list of individual permissions available. + +### Global Permissions Reference + +The following table lists each custom global permission available and whether it is assigned to the default global permissions, `Administrator` and `Standard User`. + +| Custom Global Permission | Administrator | Standard User | +| ---------------------------------- | ------------- | ------------- | +| Manage Authentication | ✓ | | +| Manage Catalogs | ✓ | | +| Manage Node Drivers | ✓ | | +| Manage PodSecurityPolicy Templates | ✓ | | +| Manage Roles | ✓ | | +| Manage Users | ✓ | | +| Create Clusters | ✓ | ✓ | +| User Catalog Templates | ✓ | ✓ | +| Login Access | ✓ | ✓ | + +> **Note:** Each permission listed above is comprised of multiple individual permissions not listed in the Rancher UI. For a full list of these permissions and the rules they are comprised of, access through the API at `/v3/globalroles`. diff --git a/content/rancher/v2.x/en/admin-settings/rbac/locked-roles/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/locked-roles/_index.md new file mode 100644 index 00000000000..d3e61d8b2ea --- /dev/null +++ b/content/rancher/v2.x/en/admin-settings/rbac/locked-roles/_index.md @@ -0,0 +1,37 @@ +--- +title: Locked Roles +weight: 1129 +--- + +You can set roles to a status of `locked`. Locking roles prevent them from being assigned users in the future. + +Locked roles: + +- Cannot be assigned to users that don't already have it assigned. +- Are not listed in the **Member Roles** drop-down when you are adding a user to a cluster or project. +- Do not affect users assigned the role before you lock the role. These users retain access that the role provides. + + **Example:** let's say your organization creates an internal policy that users assigned to a cluster are prohibited from creating new projects. It's your job to enforce this policy. + + To enforce it, before you add new users to the cluster, you should lock the following roles: `Cluster Owner`, `Cluster Member`, and `Create Projects`. Then you could create a new custom role that includes the same permissions as a __Cluster Member__, except the ability to create projects. Then, you use this new custom role when adding users to a cluster. + +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. + + +## Locking/Unlocking Roles + +If you want to prevent a role from being assigned to users, you can set it to a status of `locked`. + +You can lock roles in two contexts: + +- When you're [adding a custom role](({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/). +- When you editing an existing role (see below). + +1. From the **Global** view, select **Security** > **Roles**. + +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**. diff --git a/content/rancher/v2.x/en/admin-settings/server-url/_index.md b/content/rancher/v2.x/en/admin-settings/server-url/_index.md index ffdc30ac506..3d5af971349 100644 --- a/content/rancher/v2.x/en/admin-settings/server-url/_index.md +++ b/content/rancher/v2.x/en/admin-settings/server-url/_index.md @@ -1,6 +1,6 @@ --- title: Rancher Server URL -weight: 25 +weight: 1105 aliases: -/rancher/v2.x/en/concepts/global-configuration/server-url -/rancher/v2.x/en/tasks/global-configuration/server-url diff --git a/content/rancher/v2.x/en/catalog/_index.md b/content/rancher/v2.x/en/catalog/_index.md index 1d701ea643d..2afc528c65b 100644 --- a/content/rancher/v2.x/en/catalog/_index.md +++ b/content/rancher/v2.x/en/catalog/_index.md @@ -4,14 +4,11 @@ weight: 4000 aliases: - /rancher/v2.x/en/concepts/global-configuration/catalog/ - /rancher/v2.x/en/tasks/global-configuration/catalog/ + - /rancher/v2.x/en/tasks/global-configuration/catalog/enabling-default-catalogs/ + - /rancher/v2.x/en/tasks/global-configuration/catalog/adding-custom-catalogs/ --- -This section includes step-by-step instruction on how to configure default and custom catalogs. - -- [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/) - +Rancher provides a catalog of charts that make it easy to repeatedly deploy any applications. _Catalogs_ are GitHub repositories filled with applications that are ready-made for deployment. Applications are bundled in objects called _charts_. @@ -21,148 +18,79 @@ _Charts_ are a packaging format popularized by [Helm](https://docs.helm.sh/). Th Rancher improves on Helm catalogs and charts. All native Helm charts can work within Rancher, but Rancher adds several enhancements to improve their user experience. -## Catalog Types +## Enabling Built-in Catalogs -Within Rancher, you can access several different catalogs either by default or through customization. Enable or disable these catalogs by opening the **Global** view and then selecting **Catalogs** from the main menu. +Within Rancher, there are default catalogs packaged as part of Rancher. These can be enabled or disabled by an administrator. -- **Library** +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 Library Catalog includes charts curated by Rancher. Rancher stores charts in a Git repository to expedite the fetch and update of charts. In Rancher 2.0, only global catalogs are supported. Support for cluster-level and project-level charts will be added in the future. + - **Library** - This catalog features Rancher Charts, which include some [notable advantages](#chart-types) over native Helm charts. + The Library Catalog includes charts curated by Rancher. Rancher stores charts in a Git repository to expedite the fetch and update of charts. In Rancher 2.0, only global catalogs are supported. Support for cluster-level and project-level charts will be added in the future. -- **Helm Stable** + This catalog features Rancher Charts, which include some [notable advantages](#chart-types) over native Helm charts. - This catalog, , which is maintained by the Kubernetes community, includes native [Helm charts](https://github.com/kubernetes/helm/blob/master/docs/chart_template_guide/getting_started.md). This catalog features the largest pool of apps. + - **Helm Stable** -- **Helm Incubator** + This catalog, , which is maintained by the Kubernetes community, includes native [Helm charts](https://github.com/kubernetes/helm/blob/master/docs/chart_template_guide/getting_started.md). This catalog features the largest pool of apps. - Similar in user experience to Helm Stable, but this catalog is filled with applications in BETA. + - **Helm Incubator** -- **Custom** + Similar in user experience to Helm Stable, but this catalog is filled with applications in **beta**. - Finally, you have the option of building your own catalogs. Custom catalogs are useful when you have a handful of apps that you deploy regularly in a specific configuration. + **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. -### Custom Catalog Creation +## Adding Custom Catalogs -Creating a custom catalog for Rancher is straightforward. Create a Git repo and then direct Rancher toward the repo. +Adding a catalog is as simple as adding a catalog name, a URL and a branch name. The URL needs to be one that `git clone` [can handle](https://git-scm.com/docs/git-clone#_git_urls_a_id_urls_a) and must end in `.git`. The branch name must be a branch that is in your catalog URL. If no branch name is provided, it will use the `master` branch by default. Whenever you add a catalog to Rancher, it will be available immediately. -Custom catalog requirements include: +>**Notes:** +> +>- Currently, you can only add custom catalogs to Rancher at the global level. Therefore, any catalog that you add is shared with all clusters and projects. +> +>- Currently, only unauthenticated catalogs are supported. +
+
-- A unique name. -- A URL that `git clone` can handle. + -## Chart Types + 1. From the **Global** view, choose **Catalogs** from the main menu. + 2. Click **Add Catalog**. + 3. Complete the form and click **Create**. -Rancher supports two different types of charts: + **Result**: Your catalog is added to Rancher. -- **Helm Charts** +## Launching Catalog Applications - Native Helm charts include an application along with other software required to run it. When deploying native Helm charts, you'll learn the chart's parameters and then configure them using **Answers**, which are sets of key value pairs. +After you've either enabled the built-in catalogs or added your own custom catalog, you can start launching any catalog application. - The Helm Stable and Helm Incubators are populated with native Helm charts. However, you can also use native Helm charts in Custom catalogs (although we recommend Rancher Charts). +1. From the **Global** view, open the project that you want to deploy to. -- **Rancher Charts** +2. From the main menu, choose **Catalog Apps**. Then click **Launch**. - Rancher charts mirror native helm charts, although they add two files that enhance user experience: `app-readme.md` and `questions.yaml`. Read more about them in [Rancher Chart Additional Files](#rancher-chart-additional-files). +3. Find the app that you want to launch, and then click **View Now**. - Advantages of Rancher charts include: +4. Under **Configuration Options** enter a **Name**. By default, this name is also used to create a Kubernetes namespace for the application. - - **Enhanced Revision Tracking** + * If you would like to change the **Namespace**, click **Customize** and enter a new name. + * If you want to use a different namespace that already exists, click **Customize**, and then click **Use an existing namespace**. Choose a namespace from the list. - While Helm supports versioned deployments, Rancher adds tracking and revision history to display changes between different versions of the chart. +5. Select a **Template Version**. - - **Streamlined Application Launch** +6. Complete the rest of the **Configuration Options**. - Rancher charts add simplified chart descriptions and configuration forms to make catalog application deployment easy. Rancher users need not read through the entire list of Helm variables to understand how to launch an application. + * For native Helm charts (i.e., charts from the **Helm Stable** or **Helm Incubator** catalogs), answers are provided as key value pairs in the **Answers** section. + * Keys and values are available within **Detailed Descriptions**. - - **Application Resource Management** +7. Review the files in **Preview**. When you're satisfied, click **Launch**. - Rancher tracks all the resources created by a specific application. Users can easily navigate to and troubleshoot on a page listing all the workload objects used to power an application. +**Result**: Your application is deployed to your chosen namespace. You can view the application status from the project's: -### Chart Directory Structure - -The following table demonstrates the directory structure for a chart, which can be found in a chart directory: `charts/%application%/%app version%/`. This information is helpful when customizing charts for a custom catalog. Files denoted with **Rancher Specific** are specific to Rancher charts, but are optional for chart customization. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Sub-Directory FileDescription
app-readme.md Rancher Specific: Text displayed in the charts header within the Rancher UI.
charts/Directory containing dependency charts.
Chart.ymlRequired Helm chart information file.
questions.ymlRancher Specific: File containing form questions displayed within the Rancher UI. Questions display in Configuration Options.
README.mdOptional: Helm Readme file displayed within Rancher UI. This test displays in Detailed Descriptions.
requirements.ymlOptional YAML file listing dependencies for the chart.
templates/A directory of templates that, when combined with values.yml, generates Kubernetes YAML.
values.ymlThe default configuration values for the chart.
- -### Rancher Chart Additional Files - -Before you create your own custom catalog, you should have a basic understanding about how a Rancher chart differs from a native Helm chart. Rancher charts differ slightly from Helm charts in their directory structures. Rancher charts include two files that Helm charts do not. - -- `app-readme.md` - - A file that provides descriptive text in the chart's UI header. The following image displays the difference between a Rancher chart (which includes `app-readme.md`) and a native Helm chart (which does not). - - Rancher Chart with app-readme.md (left) vs. Helm Chart without (right) - - ![app-readme.md]({{< baseurl >}}/img/rancher/app-readme.png) - -- `questions.yml` - - A file that contains questions for a form. These form questions simplify deployment of a chart. Without it, you must configure the deployment using key value pairs, which is more difficult. The following image displays the difference between a Rancher chart (which includes `questions.yml`) and a native Helm chart (which does not). - - - Rancher Chart with question.yml (left) vs. Helm Chart without (right) - - ![questions.yml]({{< baseurl >}}/img/rancher/questions.png) - - -### Custom Chart Creation - - 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/custom-charts/). - ->**Note:** For a complete walkthrough of developing charts, see the upstream Helm chart [developer reference](https://docs.helm.sh/developing_charts/). +- **Workloads** view +- **Catalog Apps** view diff --git a/content/rancher/v2.x/en/catalog/custom-catalogs/_index.md b/content/rancher/v2.x/en/catalog/custom-catalogs/_index.md deleted file mode 100644 index cb69a270ffb..00000000000 --- a/content/rancher/v2.x/en/catalog/custom-catalogs/_index.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -title: Adding Custom Catalogs -weight: 4015 -aliases: - - /rancher/v2.x/en/tasks/global-configuration/catalog/adding-custom-catalogs/ ---- - -You can create custom catalogs of charts for use in Rancher. Custom catalogs are helpful for fast deployment of applications unique to your environment. - ->**Notes:** -> ->- Currently, you can only add custom catalogs to Rancher at the global level. Therefore, any catalog that you add is shared with all clusters and projects. -> ->- Currently, only unauthenticated catalogs are supported. -
-
- ->**Prerequisites:** -> ->- Recommended: Read [Catalogs and Charts]({{< baseurl >}}/rancher/v2.x/en/catalog/). ->- Create a GitHub repository to serve as your custom catalog. - - -1. From the **Global** view, choose **Catalogs** from the main menu. -2. Click **Add Catalog**. -3. Complete the form and click **Create**. - -**Result**: Your catalog is added to Rancher. - -## 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/custom-charts/). diff --git a/content/rancher/v2.x/en/catalog/custom-charts/_index.md b/content/rancher/v2.x/en/catalog/custom-charts/_index.md deleted file mode 100644 index bf1fb9bfcc2..00000000000 --- a/content/rancher/v2.x/en/catalog/custom-charts/_index.md +++ /dev/null @@ -1,110 +0,0 @@ ---- -title: Customizing Charts -weight: 4020 -aliases: - - /rancher/v2.x/en/tasks/global-configuration/catalog/customizing-charts/ ---- - -Before you can deploy customized catalog apps using Rancher, you must add charts to the GitHub repository serving as your custom catalog. - -The custom catalog can contain native Helm charts, Rancher charts, or a combination of both (although we recommend using Rancher charts). - ->**Prerequisites:** - ->- 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/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/#chart-directory-structure). - - Rancher requires this directory structure, although `app-readme.md` and `questions.yml` are optional. - - >**Tip:** - > - >- To begin customizing a chart, copy one from either the [Rancher Library](https://github.com/rancher/charts) or the [Helm Stable](https://github.com/kubernetes/charts/tree/master/stable). - >- For a complete walk through of developing charts, see the upstream Helm chart [developer reference](https://docs.helm.sh/developing_charts/). - -2. **Recommended:** Create an `app-readme.md` file. - - Use this file to create custom text for your chart's header in the Rancher UI. You can use this text to notify users that the chart is customized for your environment or provide special instruction on how to use it. -
-
- **Example**: - - ``` - $ cat ./app-readme.md - - # Wordpress ROCKS! - ``` - -3. **Recommended:** Create a `questions.yml` file. - - This file creates a form for users to specify deployment parameters when they deploy the custom chart. Without this file, users **must** specify the parameters manually using key value pairs, which isn't user-friendly. -
-
- The example below creates a form that prompts users for persistent volume size and a storage class. -
-
- For a list of variables you can use when creating a `questions.yml` file, see [Question Variable Reference](#question-variable-reference). - - 
-        categories:
-        - Blog
-        - CMS
-        questions:
-        - variable: persistence.enabled
-        default: "false"
-        description: "Enable persistent volume for WordPress"
-        type: boolean
-        required: true
-        label: WordPress Persistent Volume Enabled
-        show_subquestion_if: true
-        group: "WordPress Settings"
-        subquestions:
-        - variable: persistence.size
-            default: "10Gi"
-            description: "WordPress Persistent Volume Size"
-            type: string
-            label: WordPress Volume Size
-        - variable: persistence.storageClass
-            default: ""
-            description: "If undefined or null, uses the default StorageClass. Default to null"
-            type: storageclass
-            label: Default StorageClass for WordPress
-
- -4. Check the customized chart into your GitHub repo. - -**Result:** Your custom chart is added to the repo. Your Rancher Server will replicate the chart within a few minutes. - -## What's Next? - -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 - -This reference contains variables that you can use in `questions.yml`. - -| Variable | Type | Required | Description | -| ------------- | ------------- | --- |------------- | -| variable | string | true | Define the variable name specified in the `values.yml` file, using `foo.bar` for nested objects. | -| label | string | true | Define the UI label. | -| description | string | false | Specify the description of the variable.| -| type | string | false | Default to `string` if not specified (current supported types are string, boolean, int, enum, password, storageclass and hostname).| -| required | bool | false | Define if the variable is required or not (true \| false)| -| default | string | false | Specify the default value. | -| group | string | false | Group questions by input value. | -| min_length | int | false | Min character length.| -| max_length | int | false | Max character length.| -| min | int | false | Min integer length. | -| max | int | false | Max integer length. | -| options | []string | false | Specify the options when the variable type is `enum`, for example: options:
- "ClusterIP"
- "NodePort"
- "LoadBalancer"| -| valid_chars | string | false | Regular expression for input chars validation. | -| invalid_chars | string | false | Regular expression for invalid input chars validation.| -| subquestions | []subquestion | false| Add an array of subquestions.| -| show_if | string | false | Show current variable if conditional variable is true. For example `show_if: "serviceType=Nodeport"` | -| show\_subquestion_if | string | false | Show subquestions if is true or equal to one of the options. for example `show_subquestion_if: "true"`| - ->**Note:** `subquestions[]` cannot contain `subquestions` or `show_subquestions_if` keys, but all other keys in the above table are supported. diff --git a/content/rancher/v2.x/en/catalog/custom/_index.md b/content/rancher/v2.x/en/catalog/custom/_index.md new file mode 100644 index 00000000000..9a0904d4c9d --- /dev/null +++ b/content/rancher/v2.x/en/catalog/custom/_index.md @@ -0,0 +1,206 @@ +--- +title: Custom Catalogs and Charts +weight: 4020 +aliases: + - /rancher/v2.x/en/tasks/global-configuration/catalog/customizing-charts/ +--- + +Rancher's catalog service requires any custom catalogs to be structured in a specific format for the catalog service to be able to leverage it in Rancher. Any custom catalog must be a public Git repository. The URL needs to be one that `git clone` [can handle](https://git-scm.com/docs/git-clone#_git_urls_a_id_urls_a) and must end in `.git`. + +## Chart Types + +Rancher supports two different types of charts: + +- **Helm Charts** + + Native Helm charts include an application along with other software required to run it. When deploying native Helm charts, you'll learn the chart's parameters and then configure them using **Answers**, which are sets of key value pairs. + + The Helm Stable and Helm Incubators are populated with native Helm charts. However, you can also use native Helm charts in Custom catalogs (although we recommend Rancher Charts). + +- **Rancher Charts** + + Rancher charts mirror native helm charts, although they add two files that enhance user experience: `app-readme.md` and `questions.yaml`. Read more about them in [Rancher Chart Additional Files](#rancher-chart-additional-files). + + Advantages of Rancher charts include: + + - **Enhanced Revision Tracking** + + While Helm supports versioned deployments, Rancher adds tracking and revision history to display changes between different versions of the chart. + + - **Streamlined Application Launch** + + Rancher charts add simplified chart descriptions and configuration forms to make catalog application deployment easy. Rancher users need not read through the entire list of Helm variables to understand how to launch an application. + + - **Application Resource Management** + + Rancher tracks all the resources created by a specific application. Users can easily navigate to and troubleshoot on a page listing all the workload objects used to power an application. + +## Chart Directory Structure + +The following table demonstrates the directory structure for a chart, which can be found in a chart directory: `charts/%application%/%app version%/`. This information is helpful when customizing charts for a custom catalog. Files denoted with **Rancher Specific** are specific to Rancher charts, but are optional for chart customization. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Sub-Directory FileDescription
app-readme.md Rancher Specific: Text displayed in the charts header within the Rancher UI.
charts/Directory containing dependency charts.
Chart.ymlRequired Helm chart information file.
questions.ymlRancher Specific: File containing form questions displayed within the Rancher UI. Questions display in Configuration Options.
README.mdOptional: Helm Readme file displayed within Rancher UI. This test displays in Detailed Descriptions.
requirements.ymlOptional YAML file listing dependencies for the chart.
templates/A directory of templates that, when combined with values.yml, generates Kubernetes YAML.
values.ymlThe default configuration values for the chart.
+ +## Rancher Chart Additional Files + +Before you create your own custom catalog, you should have a basic understanding about how a Rancher chart differs from a native Helm chart. Rancher charts differ slightly from Helm charts in their directory structures. Rancher charts include two files that Helm charts do not. + +- `app-readme.md` + + A file that provides descriptive text in the chart's UI header. The following image displays the difference between a Rancher chart (which includes `app-readme.md`) and a native Helm chart (which does not). + + Rancher Chart with app-readme.md (left) vs. Helm Chart without (right) + + ![app-readme.md]({{< baseurl >}}/img/rancher/app-readme.png) + +- `questions.yml` + + A file that contains questions for a form. These form questions simplify deployment of a chart. Without it, you must configure the deployment using key value pairs, which is more difficult. The following image displays the difference between a Rancher chart (which includes `questions.yml`) and a native Helm chart (which does not). + + + Rancher Chart with question.yml (left) vs. Helm Chart without (right) + + ![questions.yml]({{< baseurl >}}/img/rancher/questions.png) + + +### Question Variable Reference + +This reference contains variables that you can use in `questions.yml`. + +| Variable | Type | Required | Description | +| ------------- | ------------- | --- |------------- | +| variable | string | true | Define the variable name specified in the `values.yml` file, using `foo.bar` for nested objects. | +| label | string | true | Define the UI label. | +| description | string | false | Specify the description of the variable.| +| type | string | false | Default to `string` if not specified (current supported types are string, boolean, int, enum, password, storageclass and hostname).| +| required | bool | false | Define if the variable is required or not (true \| false)| +| default | string | false | Specify the default value. | +| group | string | false | Group questions by input value. | +| min_length | int | false | Min character length.| +| max_length | int | false | Max character length.| +| min | int | false | Min integer length. | +| max | int | false | Max integer length. | +| options | []string | false | Specify the options when the variable type is `enum`, for example: options:
- "ClusterIP"
- "NodePort"
- "LoadBalancer"| +| valid_chars | string | false | Regular expression for input chars validation. | +| invalid_chars | string | false | Regular expression for invalid input chars validation.| +| subquestions | []subquestion | false| Add an array of subquestions.| +| show_if | string | false | Show current variable if conditional variable is true. For example `show_if: "serviceType=Nodeport"` | +| show\_subquestion_if | string | false | Show subquestions if is true or equal to one of the options. for example `show_subquestion_if: "true"`| + +>**Note:** `subquestions[]` cannot contain `subquestions` or `show_subquestions_if` keys, but all other keys in the above table are supported. + + +## Example Custom Chart Creation + + You can fill your custom catalogs with either Helm Charts or Rancher Charts, although we recommend Rancher Charts due to their enhanced user experience. + +>**Note:** For a complete walkthrough of developing charts, see the upstream Helm chart [developer reference](https://docs.helm.sh/developing_charts/). + +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](#chart-directory-structure). + + Rancher requires this directory structure, although `app-readme.md` and `questions.yml` are optional. + + >**Tip:** + > + >- To begin customizing a chart, copy one from either the [Rancher Library](https://github.com/rancher/charts) or the [Helm Stable](https://github.com/kubernetes/charts/tree/master/stable). + >- For a complete walk through of developing charts, see the upstream Helm chart [developer reference](https://docs.helm.sh/developing_charts/). + +2. **Recommended:** Create an `app-readme.md` file. + + Use this file to create custom text for your chart's header in the Rancher UI. You can use this text to notify users that the chart is customized for your environment or provide special instruction on how to use it. +
+
+ **Example**: + + ``` + $ cat ./app-readme.md + + # Wordpress ROCKS! + ``` + +3. **Recommended:** Create a `questions.yml` file. + + This file creates a form for users to specify deployment parameters when they deploy the custom chart. Without this file, users **must** specify the parameters manually using key value pairs, which isn't user-friendly. +
+
+ The example below creates a form that prompts users for persistent volume size and a storage class. +
+
+ For a list of variables you can use when creating a `questions.yml` file, see [Question Variable Reference](#question-variable-reference). + + 
+        categories:
+        - Blog
+        - CMS
+        questions:
+        - variable: persistence.enabled
+        default: "false"
+        description: "Enable persistent volume for WordPress"
+        type: boolean
+        required: true
+        label: WordPress Persistent Volume Enabled
+        show_subquestion_if: true
+        group: "WordPress Settings"
+        subquestions:
+        - variable: persistence.size
+            default: "10Gi"
+            description: "WordPress Persistent Volume Size"
+            type: string
+            label: WordPress Volume Size
+        - variable: persistence.storageClass
+            default: ""
+            description: "If undefined or null, uses the default StorageClass. Default to null"
+            type: storageclass
+            label: Default StorageClass for WordPress
+
+ +4. Check the customized chart into your GitHub repo. + +**Result:** Your custom chart is added to the repo. Your Rancher Server will replicate the chart within a few minutes. diff --git a/content/rancher/v2.x/en/catalog/enabling-default-catalogs/_index.md b/content/rancher/v2.x/en/catalog/enabling-default-catalogs/_index.md deleted file mode 100644 index b3b66772e7f..00000000000 --- a/content/rancher/v2.x/en/catalog/enabling-default-catalogs/_index.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -title: Enabling Default Catalogs -weight: 4005 -aliases: - - /rancher/v2.x/en/tasks/global-configuration/catalog/enabling-default-catalogs/ ---- - -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/#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/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/launching-catalog-apps). diff --git a/content/rancher/v2.x/en/catalog/launching-catalog-apps/_index.md b/content/rancher/v2.x/en/catalog/launching-catalog-apps/_index.md deleted file mode 100644 index d6c5218eca1..00000000000 --- a/content/rancher/v2.x/en/catalog/launching-catalog-apps/_index.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: Launching Catalog Applications -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/catalogs). - -1. From the **Global** view, open the project that you want to deploy to. - -2. From the main menu, choose **Catalog Apps**. Then click **Launch**. - -3. Find the app that you want to launch, and then click **View Now**. - -4. Under **Configuration Options** enter a **Name**. By default, this name is also used to create a Kubernetes namespace for the application. - - * If you would like to change the **Namespace**, click **Customize** and enter a new name. - * If you want to use a different namespace that already exists, click **Customize**, and then click **Use an existing namespace**. Choose a namespace from the list. - -5. Select a **Template Version**. - -6. Complete the rest of the **Configuration Options**. - - * For native Helm charts (i.e., charts from the **Helm Stable** or **Helm Incubator** catalogs), answers are provided as key value pairs in the **Answers** section. - * Keys and values are available within **Detailed Descriptions**. - -7. Review the files in **Preview**. When you're satisfied, click **Launch**. - -**Result**: Your application is deployed to your chosen namespace. You can view the application status from the project's: - -- **Workloads** view -- **Catalog Apps** view diff --git a/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md b/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md index 7e54af5d97f..7e58f8073dc 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md @@ -42,7 +42,7 @@ Following cluster creation, you can add users as cluster members so that they ca 4. Assign the user or group **Cluster** roles. - [What are Cluster Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#cluster-roles) + [What are Cluster Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/) >**Tip:** For Custom Roles, you can modify the list of individual roles available for assignment. > diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/_index.md index b7ddb0b1364..fafaffa21b1 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/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/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. +>- [Administrator Global Permissions]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/global-permissions/) +>- [Custom Global Permissions]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/global-permissions/#custom-global-permissions) with the [Manage Node Drivers]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/global-permissions/#global-permissions-reference) role assigned. ## Adding Custom Node Drivers diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-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 index 22a7531e685..32dc35ab7f9 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-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 @@ -12,10 +12,15 @@ aliases: 1. Enter a **Project Name**. -1. **Optional:** Select a **Pod Security Policy**. +1. **Optional:** Select a **Pod Security Policy**. Assigning a PSP to a project will: + + - Override the cluster's default PSP. + - Apply the PSP to the project. + - Apply the PSP to any namespaces you add to the project later. [What are Pod Security Policies?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies) + >**Note:** This option is only available if you've already created a Pod Security Policy. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/#creating-pod-security-policies). 1. **Recommended:** Add project members. @@ -32,9 +37,9 @@ aliases: 1. From the **Role** drop-down, choose a role. - [What are Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#cluster-and-project-roles) + [What are Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/) - >**Tip:** Choose Custom to create a custom role on the fly: [Custom Project Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#custom-project-roles). + >**Tip:** Choose Custom to create a custom role on the fly: [Custom Project Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/#custom-project-roles). 1. To add more members, repeat substeps a—c. diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md index 2b638b7acb4..9d988a5e942 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md @@ -39,7 +39,7 @@ Following project creation, you can add users as project members so that they ca 1. Assign the user or group **Project** roles. - [What are Project Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#cluster-roles) + [What are Project Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/) >**Tip:** For Custom Roles, you can modify the list of individual roles available for assignment. > diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md index cfe86c940ce..84997419933 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md @@ -7,7 +7,7 @@ aliases: >**Prerequisites:** > ->- Working with storage requires the `Manage Volumes` [role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/#project-role-reference). +>- Working with storage requires the `Manage Volumes` [role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/#project-role-reference). >- You must have a storage medium provisioned. For more information, see [Provisioning Storage](provisioning-storage). ## Adding a Persistent Volume From 0ea65c0d37b03356155292a779e0f24059a687aa Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Tue, 17 Jul 2018 14:50:12 -0700 Subject: [PATCH 8/9] psps, cluster members, project members --- .../pod-security-policies/_index.md | 10 +- .../v2.x/en/cluster-provisioning/_index.md | 2 +- .../cluster-members/_index.md | 39 +------- .../options/pod-security-policies/_index.md | 2 +- .../editing-clusters/_index.md | 44 ++++++++- .../projects-and-namespaces/_index.md | 61 ++++++++++-- .../creating-and-managing-projects/_index.md | 94 ------------------- .../editing-projects/_index.md | 75 +++++++++++++++ .../project-members/_index.md | 38 +------- 9 files changed, 184 insertions(+), 181 deletions(-) delete mode 100644 content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/creating-and-managing-projects/_index.md create mode 100644 content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/_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 d95f23280e3..ce090ec03ba 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 @@ -1,5 +1,5 @@ --- -title: Pod Security Policies +title: Managing Pod Security Policies weight: 1135 aliases: -/rancher/v2.x/en/concepts/global-configuration/pod-security-policies @@ -53,10 +53,10 @@ Using Rancher, you can create a Pod Security Policy using our GUI rather than cr 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-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) +- [When creating a cluster]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/pod-security-policies/) +- [When editing an existing cluster]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/) +- [When creating a project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/#creating-a-project/) +- [When editing an existing project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/) > **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/cluster-provisioning/_index.md b/content/rancher/v2.x/en/cluster-provisioning/_index.md index 9cab01a0590..83cb1d36afe 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/_index.md @@ -1,5 +1,5 @@ --- -title: Creating Kubernetes Clusters +title: Provisioning Kubernetes Clusters weight: 2000 aliases: - /rancher/v2.x/en/concepts/clusters/ diff --git a/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md b/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md index 7e58f8073dc..e67de558db0 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/cluster-members/_index.md @@ -15,41 +15,6 @@ There are two contexts where you can add cluster members: You can add members to a cluster as you create it (recommended if possible). -- [Adding Members to an Existing Cluster](/tasks/#adding-members-to-an-existing-cluster) +- [Adding Members to an Existing Cluster](/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/) - You can always add members to a cluster later. See below. - -### Adding Members to an Existing Cluster - -Following cluster creation, you can add users as cluster members so that they can access its resources. - -1. From the **Global** view, open the cluster that you want to add members to. - -2. From the main menu, select **Members**. Then click **Add Member**. - -3. Search for the user or group that you want to add to the cluster. - - If external authentication is configured: - - - 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/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/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/admin-settings/rbac/cluster-project-roles/) - - >**Tip:** For Custom Roles, you can modify the list of individual roles available for assignment. - > - > - To add roles to the list, [Add a Custom Role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/). - > - To remove roles from the list, [Lock/Unlock Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/#locking-unlocking-roles). - -**Result:** The chosen users are added to the cluster. - -- To revoke cluster membership, select the user and click **Delete**. This action deletes membership, not the user. -- To modify a user's roles in the cluster, delete them from the cluster, and then re-add them with modified roles. + You can always add members to a cluster after a cluster is provisioned. diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/pod-security-policies/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/pod-security-policies/_index.md index c7484956135..f4567141247 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/pod-security-policies/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/pod-security-policies/_index.md @@ -1,5 +1,5 @@ --- -title: Pod Security Policies +title: Assigning Pod Security Policies weight: 2260 --- diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md index 743aa72305f..b86f61e986a 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md @@ -4,10 +4,46 @@ weight: 3015 draft: true --- -## Increasing Number of nodes +## Editing the Cluster Membership +Following cluster creation, you can add users as cluster members so that they can access its resources. -## Adding a Pod Security Policy +1. From the **Global** view, open the cluster that you want to add members to. + +2. From the main menu, select **Members**. Then click **Add Member**. + +3. Search for the user or group that you want to add to the cluster. + + If external authentication is configured: + + - 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/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/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/admin-settings/rbac/cluster-project-roles/) + + >**Tip:** For Custom Roles, you can modify the list of individual roles available for assignment. + > + > - To add roles to the list, [Add a Custom Role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/). + > - To remove roles from the list, [Lock/Unlock Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/locked-roles). + +**Result:** The chosen users are added to the cluster. + +- To revoke cluster membership, select the user and click **Delete**. This action deletes membership, not the user. +- To modify a user's roles in the cluster, delete them from the cluster, and then re-add them with modified roles. + +## Cluster Options + +>**Note:** These cluster options are only available for [clusters that Rancher has launched Kubernetes]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/). + +### Adding/Changing a Pod Security Policy If you don't apply a PSP as you create your cluster, you can always add one later. @@ -31,3 +67,7 @@ If you don't apply a PSP as you create your cluster, you can always add one late **Result:** The PSP is applied to the cluster and any projects within the cluster. >**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. + +### Node pools + +Changing the nodes in a RKE cluster diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/_index.md index 27daae932fd..e94a22b0ed5 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/_index.md @@ -5,19 +5,16 @@ aliases: - /rancher/v2.x/en/concepts/projects/ --- -_Projects_ are a new feature in Rancher that allows you to group namespaces. Users can be added as members to the project, and the project owner can assign roles to each member to control their project access. +_Projects_ are a new concept introduced by Rancher. They are not a native Kubernetes construct. A project captures a set of policies for a set of namespaces. A user can be assigned a specific role in a project. A role can be owner, member, read-only, or [custom]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/). Policies include Kubernetes Role-Based Access Control (RBAC) policies and pod security policies. Rancher 2.0 also implements a canned network policy that isolates containers in different projects. Future versions of Rancher will implement more flexible network policies. - -_Projects_ are a new concept introduced by Rancher. They are not a native Kubernetes construct. A project captures a set of policies for a set of namespaces. A user can be assigned a specific role in a project. A role can be owner, member, read-only, or [custom]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/#adding-a-custom-role). Policies include Kubernetes Role-Based Access Control (RBAC) policies and pod security policies. Rancher 2.0 also implements a canned network policy that isolates containers in different projects. Future versions of Rancher will implement more flexible network policies. - -### Authorization +## Authorization Non-administrative users are only authorized for project access after an administrator explicitly adds them to the project's **Members** tab. >**Exception:** > Non-administrative users can access projects that they create themselves. -### Pod Security Policies +## Pod Security Policies Rancher extends Kubernetes to allow the application of [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) at the project level in addition to the cluster level. However, as a best practice, we recommend applying Pod Security Policies at the cluster level. @@ -26,3 +23,55 @@ Rancher extends Kubernetes to allow the application of [Pod Security Policies](h Kubernetes resources belong to specific namespaces. Rancher 2.0 relies on namespaces to isolate resources among users and apps. When the user deploys an app from the catalog, for example, he can choose to deploy that app into its own namespace, so that resource names in one app will not conflict with resource names in another. Namespaces must be globally unique. It is often difficult for users to pick unique namespace names. Rancher therefore encourages the pattern where users work with projects, and the system generates unique namespace names automatically. For more information, see the [Kubernetes Namespaces Documentation](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/). + +## Creating Projects + +1. From the **Global** view, choose **Clusters** from the main menu. From the **Clusters** page, open the cluster from which you want to create a project. + +1. From the main menu, choose **Projects/Namespaces**. Then click **Add Project**. + +1. Enter a **Project Name**. + +1. **Optional:** Select a **Pod Security Policy**. Assigning a PSP to a project will: + + - Override the cluster's default PSP. + - Apply the PSP to the project. + - Apply the PSP to any namespaces you add to the project later. + + >**Note:** This option is only available if you've already created a Pod Security Policy. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). + +1. **Recommended:** Add project members. + + Use the **Members** accordion to provide other users with project access and roles. + + By default, your user is added as the project `Owner`. + + 1. Click **Add Member**. + + 1. From the **Name** combo box, search for a user or group that you want to assign project access. + + >**Note:** You can only search for groups if external authentication is enabled. + + 1. From the **Role** drop-down, choose a role. + + [What are Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/) + + >**Tip:** Choose Custom to create a custom role on the fly: [Custom Project Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/#custom-project-roles). + + 1. To add more members, repeat substeps a—c. + + +1. Click **Create**. + +**Result:** Your project is created. You can view it from the cluster's **Projects/Namespaces** view. + +## Switching Projects + +To switch between clusters, use the **Global** drop-down available in the main menu. + +![Global Menu]({{< baseurl >}}/img/rancher/global-menu.png) + +Alternatively, you can switch between projects and clusters using the main menu. + +- To switch between clusters, open the **Global** view and select **Clusters** from the main menu. Then open a cluster. +- To switch between projects, open a cluster, and then select **Projects/Namespaces** from the main menu. Select the link for the project that you want to open. diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-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 deleted file mode 100644 index 32dc35ab7f9..00000000000 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/creating-and-managing-projects/_index.md +++ /dev/null @@ -1,94 +0,0 @@ ---- -title: Creating and Managing Projects -weight: 3021 -aliases: - - /rancher/v2.x/en/tasks/projects/create-project/ ---- - - -1. From the **Global** view, choose **Clusters** from the main menu. From the **Clusters** page, open the cluster from which you want to create a project. - -1. From the main menu, choose **Projects/Namespaces**. Then click **Add Project**. - -1. Enter a **Project Name**. - -1. **Optional:** Select a **Pod Security Policy**. Assigning a PSP to a project will: - - - Override the cluster's default PSP. - - Apply the PSP to the project. - - Apply the PSP to any namespaces you add to the project later. - - [What are Pod Security Policies?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies) - - - >**Note:** This option is only available if you've already created a Pod Security Policy. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/#creating-pod-security-policies). - -1. **Recommended:** Add project members. - - Use the **Members** accordion to provide other users with project access and roles. - - By default, your user is added as the project `Owner`. - - 1. Click **Add Member**. - - 1. From the **Name** combo box, search for a user or group that you want to assign project access. - - >**Note:** You can only search for groups if external authentication is enabled. - - 1. From the **Role** drop-down, choose a role. - - [What are Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/) - - >**Tip:** Choose Custom to create a custom role on the fly: [Custom Project Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/#custom-project-roles). - - 1. To add more members, repeat substeps a—c. - - -1. Click **Create**. - -**Result:** Your project is created. You can view it from the cluster's **Projects/Namespaces** view. - -## Switching projects - -To switch between clusters, use the **Global** drop-down available in the main menu. - -![Global Menu]({{< baseurl >}}/img/rancher/global-menu.png) - -Alternatively, you can switch between projects and clusters using the main menu. - -- To switch between clusters, open the **Global** view and select **Clusters** from the main menu. Then open a cluster. -- To switch between projects, open a cluster, and then select **Projects/Namespaces** from the main menu. Select the link for the project that you want to open. - - -## Editing the Pod Security Policy - -You can always assign a PSP to an existing project if you didn't assign one during creation. - ->**Prerequisites:** -> -> - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). -> - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [Existing Cluster: Adding a Pod Security Policy](#existing-cluster--adding-a-pod-security-policy). - -1. From the **Global** view, find the cluster containing the project you want to apply a PSP to. - -1. From the main menu, select **Projects/Namespaces**. - -3. Find the project that you want to add a PSP to. From that project, select **Vertical Ellipsis (...) > Edit**. - -4. From the **Pod Security Policy** drop-down, select the PSP you want to apply to the project. - Assigning a PSP to a project will: - - - Override the cluster's default PSP. - - Apply the PSP to the project. - - Apply the PSP to any namespaces you add to the project later. - - >**Prerequisites:** - > - > - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to a new project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). - > - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. - -5. Click **Save**. - -**Result:** The PSP is applied to the project and any namespaces added to the project. - ->**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/_index.md new file mode 100644 index 00000000000..6abb38396f0 --- /dev/null +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/_index.md @@ -0,0 +1,75 @@ +--- +title: Creating and Managing Projects +weight: 3021 +aliases: + - /rancher/v2.x/en/tasks/projects/create-project/ +--- + +After projects are created, there are certain aspects that can be changed later. + +## Adding Members + +Following project creation, you can add users as project members so that they can access its resources. + +1. From the **Global** view, open the project that you want to add members to. + +2. From the main menu, select **Members**. Then click **Add Member**. + +3. Search for the user or group that you want to add to the project. + + If external authentication is configured: + + - Rancher returns users from your external authentication source as you type. + + - A drop-down allows you to add groups instead of individual users. The dropdown only lists groups that you, the logged in user, are included in. + + >**Note:** If you are logged in as a local user, external users do not display in your search results. + +1. Assign the user or group **Project** roles. + + [What are Project Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/) + + >**Tip:** For Custom Roles, you can modify the list of individual roles available for assignment. + > + > - To add roles to the list, [Add a Custom Role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/default-custom-roles). + > - To remove roles from the list, [Lock/Unlock Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/locked-roles/). + +**Result:** The chosen users are added to the project. + +- To revoke project membership, select the user and click **Delete**. This action deletes membership, not the user. +- To modify a user's roles in the project, delete them from the project, and then re-add them with modified roles. + +## Editing the Pod Security Policy + +>**Note:** These cluster options are only available for [clusters that Rancher has launched Kubernetes]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/). + +You can always assign a PSP to an existing project if you didn't assign one during creation. + +>**Prerequisites:** +> +> - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). +> - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [Existing Cluster: Adding a Pod Security Policy](#existing-cluster--adding-a-pod-security-policy). + +1. From the **Global** view, find the cluster containing the project you want to apply a PSP to. + +1. From the main menu, select **Projects/Namespaces**. + +3. Find the project that you want to add a PSP to. From that project, select **Vertical Ellipsis (...) > Edit**. + +4. From the **Pod Security Policy** drop-down, select the PSP you want to apply to the project. + Assigning a PSP to a project will: + + - Override the cluster's default PSP. + - Apply the PSP to the project. + - Apply the PSP to any namespaces you add to the project later. + + >**Prerequisites:** + > + > - Create a Pod Security Policy within Rancher. Before you can assign a default PSP to a new project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/). + > - Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. + +5. Click **Save**. + +**Result:** The PSP is applied to the project and any namespaces added to the project. + +>**Note:** Any workloads that are already running in a cluster or project before a PSP is assigned will not be checked if it complies with the PSP. Workloads would need to be cloned or upgraded to see if they pass the PSP. diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md index 9d988a5e942..3cb621a46be 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md @@ -11,42 +11,10 @@ If you want to provide a user with access and permissions to _specific_ projects 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-and-namespaces/project-members/) +- [Adding Members when Creating New Projects]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/) You can add members to a project as you create it (recommended if possible). -- [Adding Members to an Existing Project](#adding-members-to-an-existing-project) +- [Adding Members to an Existing Project]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/) - You can always add members to a project later. See below. - -### Adding Members to an Existing project - -Following project creation, you can add users as project members so that they can access its resources. - -1. From the **Global** view, open the project that you want to add members to. - -2. From the main menu, select **Members**. Then click **Add Member**. - -3. Search for the user or group that you want to add to the project. - - If external authentication is configured: - - - Rancher returns users from your external authentication source as you type. - - - A drop-down allows you to add groups instead of individual users. The dropdown only lists groups that you, the logged in user, are included in. - - >**Note:** If you are logged in as a local user, external users do not display in your search results. - -1. Assign the user or group **Project** roles. - - [What are Project Roles?]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/) - - >**Tip:** For Custom Roles, you can modify the list of individual roles available for assignment. - > - > - To add roles to the list, [Add a Custom Role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/#adding-a-custom-role). - > - To remove roles from the list, [Lock/Unlock Roles]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/creating-roles/#locking-unlocking-roles). - -**Result:** The chosen users are added to the project. - -- To revoke project membership, select the user and click **Delete**. This action deletes membership, not the user. -- To modify a user's roles in the project, delete them from the project, and then re-add them with modified roles. + You can always add members to a project later. From ffb24e0eb456c8673e7fa370f9fbf32939e89fba Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Tue, 17 Jul 2018 15:00:55 -0700 Subject: [PATCH 9/9] cleaning up storage --- .../editing-clusters/_index.md | 1 - .../editing-projects/_index.md | 2 +- .../project-members/_index.md | 2 +- .../volumes-and-storage/_index.md | 92 ++++++++++++++++++- .../examples/nfs/_index.md | 6 +- .../_index.md | 2 +- .../_index.md | 92 ------------------- 7 files changed, 93 insertions(+), 104 deletions(-) rename content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/{persistent-volume-claim => persistent-volume-claims}/_index.md (87%) delete mode 100644 content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md index b86f61e986a..555cf2c180d 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/editing-clusters/_index.md @@ -1,7 +1,6 @@ --- title: Editing Clusters weight: 3015 -draft: true --- ## Editing the Cluster Membership diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/_index.md index 6abb38396f0..73e878d3e47 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/editing-projects/_index.md @@ -1,5 +1,5 @@ --- -title: Creating and Managing Projects +title: Editing Projects weight: 3021 aliases: - /rancher/v2.x/en/tasks/projects/create-project/ diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md index 3cb621a46be..3ce56f7e921 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/projects-and-namespaces/project-members/_index.md @@ -1,5 +1,5 @@ --- -title: Adding and Managing Project Members +title: Adding Users to Projects weight: 3022 aliases: - /rancher/v2.x/en/tasks/projects/add-project-members/ diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md index 5d0d11c3b42..861acf52685 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/_index.md @@ -3,6 +3,7 @@ title: Volumes and Storage weight: 3050 aliases: - /rancher/v2.x/en/concepts/volumes-and-storage/ + - /rancher/v2.x/en/tasks/clusters/adding-storage/ --- There are two ways to create volumes on Kubernetes: Persistent Volumes (PVs) and Storage Classes. @@ -14,6 +15,61 @@ _Persistent Volumes_ are pre-provisioned storage volumes that you can bind to sp Rancher allows you to create PVs at cluster level and bind them to PVCs later. Volumes are managed on a per-project basis. +### Adding a Persistent Volume + +>**Prerequisites:** +> +>- Working with storage requires the `Manage Volumes` [role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/#project-role-reference). +>- You must have a storage medium provisioned. For more information, see [Provisioning Storage](provisioning-storage). + +Your containers can store data on themselves, but if a container fails, that data is lost. To solve this issue, Kubernetes offers _persistent volumes_, which are external storage disks or file systems that your containers can access. If a container crashes, its replacement container can access the data in a persistent volume without any data loss. + +Persistent volumes can either be a disk or file system that you host on premise, or they can be hosted by a vendor, such as Amazon EBS or Azure Disk. + +>**Prerequisite:** +> +>- Create a storage volume either on premise or in the cloud, using one of the vendor services listed in [Types of Persistent Volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#types-of-persistent-volumes). +>- Gather metadata about your storage volume after you create it. You'll need to enter this information into Rancher. + +1. From the **Global** view, open the cluster running the containers that you want to add persistent volume storage to. + +1. From the main menu, select **Storage > Persistent Volumes**. + +1. Click **Add Volume**. + +1. Enter a **Name** for the persistent volume. + +1. Select the **Volume Plugin** for the disk type or service that you're using. + + >**Note:** If the cluster you are adding storage for is a cloud service that also offers cloud storage, you must enable the `cloud provider` option for the cluster, and you must use the service's plug-in to use cloud storage. For example, if you have a Amazon EC2 cluster and you want to use cloud storage for it: + + 1. You must enable the `cloud provider` option for the EC2 cluster. + 2. You must use the `Amazon EBS Disk` volume plugin. + +1. Enter the **Capacity** of your volume in gigabytes. + +1. Complete the **Plugin Configuration** form. Each plugin type requires information specific to the vendor of disk type. For help regarding each plugin's form and the information that's required, refer to the plug-in's vendor documentation. + +1. **Optional:** Complete the **Customize** form. This form features: + + - [Access Modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes): + + This options sets how many nodes can access the volume, along with the node read/write permissions. The [Kubernetes Documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) includes a table that lists which access modes are supported by the plugins available. + + - [Mount Options](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#mount-options): + + Each volume plugin allows you to specify additional command line options during the mounting process. You can enter these options in the **Mount Option** fields. Consult each plugin's vendor documentation for the mount options available. + + - **Assign to Storage Class:** + + If you later want to automatically provision persistent volumes identical to the volume that you've specified here, assign it a storage class. Later, when you create a workload, you can assign it a persistent volume claim that references the storage class, which will provision a persistent volume identical to the volume you've specified here. + + >**Note:** You must [add a storage class](#adding-storage-classes) before you can assign it to a persistent volume. + +1. Click **Save**. + +**Result:** Your new persistent volume is created. + ## Storage Classes Storage Classes allow you to create PVCs dynamically without having to create PVs first. For example, an Amazon EBS Storage Class will dynamically create EBS volumes and bind them to PVCs. A Storage Class is similar to the notion of a _storage driver_. The following figure illustrates how a PVC creation triggers the dynamic provisioning of an underlying EBS volume. @@ -49,13 +105,39 @@ Finally, you can define custom `MountOptions` for the persistent volume created. `parameters` are specific to each cloud storage provisioner. For full information about the storage classes provisioner parameters, refer to the official [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/#parameters). +### Adding Storage Classes + +_Storage Classes_ allow you to dynamically provision persistent volumes on demand. Think of storage classes as storage profiles that are created automatically upon a request (which is known as a _persistent volume claim_). + +1. From the **Global** view, open the cluster for which you want to dynamically provision persistent storage volumes. + +1. From the main menu, select `Storage > Storage Classes`. Click `Add Class`. + +1. Enter a `Name` for your storage class. + +1. From the `Provisioner` drop-down, select the service that you want to use to dynamically provision storage volumes. + + >**Note:** If the cluster you are adding a storage class for is a cloud service that also offers cloud storage, you must enable the `cloud provider` option for the cluster, and you must use the service's plug-in to use cloud storage. For example, if you have a Amazon EC2 cluster and you want to use cloud storage for it: + + 1. You must enable the `cloud provider` option for the EC2 cluster. + 2. You must use the `Amazon EBS Disk` provisioner. + + +1. From the `Parameters` section, fill out the information required for the service to dynamically provision storage volumes. Each provisioner requires different information to dynamically provision storage volumes. Consult the service's documentation for help on how to obtain this information. + +1. Click `Save`. + +## What's Next? + +Mount Persistent Volumes to workloads so that your applications can store their data. You can mount a either a manually created Persistent Volumes or a dynamically created Persistent Volume, which is created from a a Storage Class. + +You can mount Persistent Volumes in one of two contexts: + +- During deployment of a workload (recommended if possible). For more information, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/workloads/deploy-workloads/). +- Following workload creation. For more information, see [Adding Persistent Volume Claims]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claims/). + ## Related Links ### External Docs - [Storage](https://kubernetes.io/docs/concepts/storage/) - -### Tutorials - -- [Adding Storage]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/) -- [Adding Persistent Volume Claims]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim) diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md index 7eb90386e39..4ee35a50945 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/examples/nfs/_index.md @@ -1,5 +1,5 @@ --- -title: Provisioning NFS Storage +title: NFS Storage weight: 3054 aliases: - /rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/ @@ -9,7 +9,7 @@ Before you can use the NFS storage volume plug-in with Rancher deployments, you >**Note:** > ->- If you already have an NFS share, you don't need to provision a new NFS server to use the NFS volume plugin within Rancher. Instead, skip the rest of this procedure and complete [adding storage]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/). +>- If you already have an NFS share, you don't need to provision a new NFS server to use the NFS volume plugin within Rancher. Instead, skip the rest of this procedure and complete [adding storage]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/). > >- This procedure demonstrates how to setup an NFS server using Ubuntu, although you should be able to use these instructions for other Linux distros (e.g. Debian, RHEL, Arch Linux, etc.). For official instruction on how to create an NFS server using another Linux distro, consult the distro's documentation. @@ -65,4 +65,4 @@ Before you can use the NFS storage volume plug-in with Rancher deployments, you ## What's Next? -Within Rancher, add the NFS server as a [storage volume]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/#adding-a-persistent-volume) and/or [storage class]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/#adding-storage-classes). After adding the server, you can use it for storage for your deployments. +Within Rancher, add the NFS server as a [storage volume]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/#adding-a-persistent-volume) and/or [storage class]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/#adding-storage-classes). After adding the server, you can use it for storage for your deployments. diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claims/_index.md similarity index 87% rename from content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md rename to content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claims/_index.md index 259c29b49df..0b694cba100 100644 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claim/_index.md +++ b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volume-claims/_index.md @@ -12,7 +12,7 @@ _Persistent Volume Claims_ (or PVCs) are objects that request storage resources - Each Rancher project contains a list of PVCs that you've created, available from the **Volumes** tab. You can reuse these PVCs when creating deployments in the future. >**Prerequisite:** -> You must have a pre-provisioned [persistent volume]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/#adding-a-persistent-volume) available for use, or you must have a [storage class created]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/#adding-storage-classes) that dynamically creates a volume upon request from the workload. +> You must have a pre-provisioned [persistent volume]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/#adding-a-persistent-volume) available for use, or you must have a [storage class created]({{< baseurl >}}/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/#adding-storage-classes) that dynamically creates a volume upon request from the workload. 1. From the **Global** view, open the project containing a workload that you want to add a PVC to. diff --git a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md b/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md deleted file mode 100644 index 84997419933..00000000000 --- a/content/rancher/v2.x/en/kubernetes-in-rancher/volumes-and-storage/persistent-volumes-and-storage-classes/_index.md +++ /dev/null @@ -1,92 +0,0 @@ ---- -title: Persistent Volumes and Storage Classes -weight: 3051 -aliases: - - /rancher/v2.x/en/tasks/clusters/adding-storage/ ---- - ->**Prerequisites:** -> ->- Working with storage requires the `Manage Volumes` [role]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/#project-role-reference). ->- You must have a storage medium provisioned. For more information, see [Provisioning Storage](provisioning-storage). - -## Adding a Persistent Volume - -Your containers can store data on themselves, but if a container fails, that data is lost. To solve this issue, Kubernetes offers _persistent volumes_, which are external storage disks or file systems that your containers can access. If a container crashes, its replacement container can access the data in a persistent volume without any data loss. - -Persistent volumes can either be a disk or file system that you host on premise, or they can be hosted by a vendor, such as Amazon EBS or Azure Disk. - ->**Prerequisite:** -> ->- Create a storage volume either on premise or in the cloud, using one of the vendor services listed in [Types of Persistent Volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#types-of-persistent-volumes). ->- Gather metadata about your storage volume after you create it. You'll need to enter this information into Rancher. - -1. From the **Global** view, open the cluster running the containers that you want to add persistent volume storage to. - -1. From the main menu, select **Storage > Persistent Volumes**. - -1. Click **Add Volume**. - -1. Enter a **Name** for the persistent volume. - -1. Select the **Volume Plugin** for the disk type or service that you're using. - - >**Note:** If the cluster you are adding storage for is a cloud service that also offers cloud storage, you must enable the `cloud provider` option for the cluster, and you must use the service's plug-in to use cloud storage. For example, if you have a Amazon EC2 cluster and you want to use cloud storage for it: - - 1. You must enable the `cloud provider` option for the EC2 cluster. - 2. You must use the `Amazon EBS Disk` volume plugin. - -1. Enter the **Capacity** of your volume in gigabytes. - -1. Complete the **Plugin Configuration** form. Each plugin type requires information specific to the vendor of disk type. For help regarding each plugin's form and the information that's required, refer to the plug-in's vendor documentation. - -1. **Optional:** Complete the **Customize** form. This form features: - - - [Access Modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes): - - This options sets how many nodes can access the volume, along with the node read/write permissions. The [Kubernetes Documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) includes a table that lists which access modes are supported by the plugins available. - - - [Mount Options](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#mount-options): - - Each volume plugin allows you to specify additional command line options during the mounting process. You can enter these options in the **Mount Option** fields. Consult each plugin's vendor documentation for the mount options available. - - - **Assign to Storage Class:** - - If you later want to automatically provision persistent volumes identical to the volume that you've specified here, assign it a storage class. Later, when you create a workload, you can assign it a persistent volume claim that references the storage class, which will provision a persistent volume identical to the volume you've specified here. - - >**Note:** You must [add a storage class](#adding-storage-classes) before you can assign it to a persistent volume. - -1. Click **Save**. - -**Result:** Your new persistent volume is created. - -## Adding Storage Classes - -_Storage Classes_ allow you to dynamically provision persistent volumes on demand. Think of storage classes as storage profiles that are created automatically upon a request (which is known as a _persistent volume claim_). - -1. From the **Global** view, open the cluster for which you want to dynamically provision persistent storage volumes. - -1. From the main menu, select `Storage > Storage Classes`. Click `Add Class`. - -1. Enter a `Name` for your storage class. - -1. From the `Provisioner` drop-down, select the service that you want to use to dynamically provision storage volumes. - - >**Note:** If the cluster you are adding a storage class for is a cloud service that also offers cloud storage, you must enable the `cloud provider` option for the cluster, and you must use the service's plug-in to use cloud storage. For example, if you have a Amazon EC2 cluster and you want to use cloud storage for it: - - 1. You must enable the `cloud provider` option for the EC2 cluster. - 2. You must use the `Amazon EBS Disk` provisioner. - - -1. From the `Parameters` section, fill out the information required for the service to dynamically provision storage volumes. Each provisioner requires different information to dynamically provision storage volumes. Consult the service's documentation for help on how to obtain this information. - -1. Click `Save`. - -## What's Next? - -Mount Persistent Volumes to workloads so that your applications can store their data. You can mount a either a manually created Persistent Volumes or a dynamically created Persistent Volume, which is created from a a Storage Class. - -You can mount Persistent Volumes in one of two contexts: - -- During deployment of a workload (recommended if possible). For more information, see [Deploying Workloads](../../workloads/deploy-workloads/). -- Following workload creation. For more information, see [Adding Persistent Volume Claims](../../workloads/add-persistent-volume-claim/).