From 663dfd5212d4539781b48a8bae7f844c1521d3f7 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Wed, 22 Aug 2018 11:25:29 -0700 Subject: [PATCH 1/3] putting options only availble for RKE clusters under an RKE subheading --- .../en/k8s-in-rancher/editing-clusters/_index.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md index 4a90ba4fa88..0f2e6076a16 100644 --- a/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md +++ b/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md @@ -60,7 +60,11 @@ Cluster administrators can edit the membership for a cluster, controlling which - 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. -## Upgrading Kubernetes +## Options for RKE Clusters + +When editing clusters, clusters that are [launched using RKE]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/) feature more options than clusters that are imported or hosted by a Kubernetes provider. The headings that follow document options available only for RKE clusters. + +### Upgrading Kubernetes Following an upgrade to the latest version of Rancher, you can update your existing clusters to use the latest supported version of Kubernetes. Before a new version of Rancher is released, it's tested with the latest versions of Kubernetes to ensure compatibility. @@ -76,7 +80,7 @@ Following an upgrade to the latest version of Rancher, you can update your exist **Result:** Kubernetes begins upgrading for the cluster. During the upgrade, your cluster is unavailable. -## Adding a Pod Security Policy +### Adding a Pod Security Policy When your cluster is running pods with security-sensitive configurations, assign it a [pod security policy]({{< baseurl >}}/rancher/v2.x/en/admin-settings/pod-security-policies/), which is a set of rules that monitors the conditions and settings in your pods. If a pod doesn't meet the rules specified in your policy, the policy stops it from running. @@ -102,7 +106,7 @@ You can assign a pod security policy when you provision a cluster. However, if y > >To check if a running workload passes your pod security policy, clone or upgrade it. -## Editing Other Cluster Options +### Editing Other Cluster Options In [clusters launched by RKE]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/), you can edit any of the remaining options that follow. @@ -124,8 +128,8 @@ Option | Description | Docker Root Directory | The directory on your cluster nodes where you've installed Docker. If you install Docker on your nodes to a non-default directory, update this path. | Default Pod Security Policy | If you enable **Pod Security Policy Support**, use this drop-down to choose the pod security policy that's applied to the cluster. | Cloud Provider | If you're using a cloud provider to host cluster nodes launched by RKE, enable [this option]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/cloud-providers/) so that you can use the cloud provider's native features. If you want to store persistent data for your cloud-hosted cluster, this option is required. | - -## Managing Node Pools +
+### Managing Node Pools In clusters [launched by RKE]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/), you can: @@ -141,7 +145,7 @@ In clusters [launched by RKE]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioni >**Note:** The Node Pools section is not available for imported clusters or clusters hosted by a Kubernetes provider. -## Editing Cluster as YAML +### Editing Cluster as YAML >**Note:** In Rancher v2.0.5 and v2.0.6, the names of services in the Config File (YAML) should contain underscores only: `kube_api` and `kube_controller`. From bff82c329b5f7b8f0ea0fc1d7695ab0c491bbcc4 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Wed, 22 Aug 2018 14:45:22 -0700 Subject: [PATCH 2/3] moved up yaml topic --- .../k8s-in-rancher/editing-clusters/_index.md | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md index 0f2e6076a16..fb4cc33ffa0 100644 --- a/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md +++ b/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md @@ -129,6 +129,19 @@ Option | Description | Default Pod Security Policy | If you enable **Pod Security Policy Support**, use this drop-down to choose the pod security policy that's applied to the cluster. | Cloud Provider | If you're using a cloud provider to host cluster nodes launched by RKE, enable [this option]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/cloud-providers/) so that you can use the cloud provider's native features. If you want to store persistent data for your cloud-hosted cluster, this option is required. |
+##### Editing Cluster as YAML + +>**Note:** In Rancher v2.0.5 and v2.0.6, the names of services in the Config File (YAML) should contain underscores only: `kube_api` and `kube_controller`. + +Instead of using the Rancher UI to choose Kubernetes options for the cluster, advanced users can create an RKE config file. Using a config file allows you to set any of the [options available]({{< baseurl >}}/rke/v0.1.x/en/config-options/) in an RKE installation. + +- To edit an RKE config file directly from the Rancher UI, click **Edit as YAML**. +- To read from an existing RKE file, click **Read from File**. + +![image]({{< baseurl >}}/img/rancher/cluster-options-yaml.png) + +For an example of RKE config file syntax, see the [RKE documentation]({{< baseurl >}}/rke/v0.1.x/en/example-yamls/). + ### Managing Node Pools In clusters [launched by RKE]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/), you can: @@ -145,15 +158,3 @@ In clusters [launched by RKE]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioni >**Note:** The Node Pools section is not available for imported clusters or clusters hosted by a Kubernetes provider. -### Editing Cluster as YAML - ->**Note:** In Rancher v2.0.5 and v2.0.6, the names of services in the Config File (YAML) should contain underscores only: `kube_api` and `kube_controller`. - -Instead of using the Rancher UI to choose Kubernetes options for the cluster, advanced users can create an RKE config file. Using a config file allows you to set any of the [options available]({{< baseurl >}}/rke/v0.1.x/en/config-options/) in an RKE installation. - -- To edit an RKE config file directly from the Rancher UI, click **Edit as YAML**. -- To read from an existing RKE file, click **Read from File**. - -![image]({{< baseurl >}}/img/rancher/cluster-options-yaml.png) - -For an example of RKE config file syntax, see the [RKE documentation]({{< baseurl >}}/rke/v0.1.x/en/example-yamls/). \ No newline at end of file From d49630126883dc1762ef247936e23a579e5b0f8e Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Wed, 22 Aug 2018 15:06:06 -0700 Subject: [PATCH 3/3] more heading level edits after further discussions with Denise. --- .../v2.x/en/k8s-in-rancher/editing-clusters/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md index fb4cc33ffa0..dc91999fd9b 100644 --- a/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md +++ b/content/rancher/v2.x/en/k8s-in-rancher/editing-clusters/_index.md @@ -60,7 +60,7 @@ Cluster administrators can edit the membership for a cluster, controlling which - 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. -## Options for RKE Clusters +## Cluster Options When editing clusters, clusters that are [launched using RKE]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/) feature more options than clusters that are imported or hosted by a Kubernetes provider. The headings that follow document options available only for RKE clusters. @@ -129,7 +129,7 @@ Option | Description | Default Pod Security Policy | If you enable **Pod Security Policy Support**, use this drop-down to choose the pod security policy that's applied to the cluster. | Cloud Provider | If you're using a cloud provider to host cluster nodes launched by RKE, enable [this option]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/cloud-providers/) so that you can use the cloud provider's native features. If you want to store persistent data for your cloud-hosted cluster, this option is required. |
-##### Editing Cluster as YAML +#### Editing Cluster as YAML >**Note:** In Rancher v2.0.5 and v2.0.6, the names of services in the Config File (YAML) should contain underscores only: `kube_api` and `kube_controller`. @@ -142,7 +142,7 @@ Instead of using the Rancher UI to choose Kubernetes options for the cluster, ad For an example of RKE config file syntax, see the [RKE documentation]({{< baseurl >}}/rke/v0.1.x/en/example-yamls/). -### Managing Node Pools +## Managing Node Pools In clusters [launched by RKE]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/), you can: