From 1d25322a6fbee063ff499dac56b77b33b9901c44 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Fri, 22 Jun 2018 14:31:57 -0700 Subject: [PATCH] small fixes from feedback --- .../en/installation/managing-clusters/_index.md | 4 ++++ content/rke/v0.1.x/en/installation/os/_index.md | 5 ++--- content/rke/v0.1.x/en/quick-start-guide/_index.md | 12 +++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/content/rke/v0.1.x/en/installation/managing-clusters/_index.md b/content/rke/v0.1.x/en/installation/managing-clusters/_index.md index aa24045a99e..a06008de29c 100644 --- a/content/rke/v0.1.x/en/installation/managing-clusters/_index.md +++ b/content/rke/v0.1.x/en/installation/managing-clusters/_index.md @@ -14,6 +14,10 @@ In order to remove nodes, remove the node information from the nodes list in the After you've made changes to add/remove nodes, run `rke up` with the updated `cluster.yml`. +### Adding/Removing Worker Nodes + +You can add/remove only worker nodes, by running `rke up --update-only`. This will ignore everything else in the `cluster.yml` except for any worker nodes. + ### Removing Kubernetes Clusters from Nodes In order to remove the Kubernetes components from nodes, you use the `rke remove` command. diff --git a/content/rke/v0.1.x/en/installation/os/_index.md b/content/rke/v0.1.x/en/installation/os/_index.md index 72cafe87a3d..dfb817a8d60 100644 --- a/content/rke/v0.1.x/en/installation/os/_index.md +++ b/content/rke/v0.1.x/en/installation/os/_index.md @@ -4,8 +4,7 @@ weight: 55 draft: true --- - +RKE runs on almost any Linux OS with Docker installed. Most of the development and testing of RKE occurred on Ubuntu 16.04. However, some OS's have restrictions and specific requirements. ### OS Requirements @@ -45,6 +44,6 @@ By default, Atomic hosts ship with OpenSSH 6.4, which doesn't support SSH tunnel By default, Atomic hosts do not come with a Docker group. You can update the ownership of the Docker socket by enabling the specific user in order to launch RKE. -``` +``` # chown /var/run/docker.sock ``` diff --git a/content/rke/v0.1.x/en/quick-start-guide/_index.md b/content/rke/v0.1.x/en/quick-start-guide/_index.md index 681d4f54287..d1f85d42058 100644 --- a/content/rke/v0.1.x/en/quick-start-guide/_index.md +++ b/content/rke/v0.1.x/en/quick-start-guide/_index.md @@ -44,11 +44,13 @@ RKE is a fast, versatile Kubernetes installer that you can use to install Kubern ## Prepare the Nodes for the Kubernetes cluster -The Kubernetes cluster components are launched using Docker on a Linux machine. You can use any Linux you want, as long as you can install Docker on it. The most commonly used OS is the current Ubuntu LTS release, 16.04. Kubernetes runs integration tests on the following Docker versions: `1.11.2` to `1.13.1`, and `17.03.x`. We follow these tested Docker versions by marking them as supported. +The Kubernetes cluster components are launched using Docker on a Linux distro. You can use any Linux you want, as long as you can install Docker on it. + +As Kubernetes only supports Docker `1.11.2` to `1.13.1`, and `17.03.x`, RKE also supports the same Docker versions. ### Install Docker -You can either follow the [Docker installation](https://docs.docker.com/install/) instructions or you can use one of Rancher's [install scripts](https://github.com/rancher/install-docker) to install Docker. +You can either follow the [Docker installation](https://docs.docker.com/install/) instructions or use one of Rancher's [install scripts](https://github.com/rancher/install-docker) to install Docker. Docker Version | Install Script | ----------|------------------ @@ -59,7 +61,7 @@ Docker Version | Install Script | Confirm that a Kubernetes supported version of Docker is installed on your machine, by running `docker version`. -``` +``` $ docker version Client: Version: 17.03.2-ce @@ -98,7 +100,7 @@ There are two easy ways to create a `cluster.yml`: ### Using `rke config` -To create a new `cluster.yml`, you can run `rke config` and this command will query for all the information needed to build your cluster. Review [our cluster configuration options]({{< baseurl >}}/rke/v0.1.x/en/config-options/) to understand what each question means. The ones that are required for this quick start guide are in the example below. +To create a new `cluster.yml`, you can run `rke config` and this command prompts you for all the information needed to build your cluster. Review [our cluster configuration options]({{< baseurl >}}/rke/v0.1.x/en/config-options/) to understand what each question means. The ones that are required for this quick start guide are in the example below. > **Note:** As features are added into RKE, the list and order of questions may change. @@ -159,7 +161,7 @@ Client Version: version.Info{Major:"1", Minor:"10", GitVersion:"v1.10.0", GitCom Server Version: version.Info{Major:"1", Minor:"8+", GitVersion:"v1.8.9-rancher1", GitCommit:"68595e18f25e24125244e9966b1e5468a98c1cd4", GitTreeState:"clean", BuildDate:"2018-03-13T04:37:53Z", GoVersion:"go1.8.3", Compiler:"gc", Platform:"linux/amd64"} ``` -The client and server version are reported, indicating that you have a local `kubectl` client and are able to request the server version from the newly built cluster. Now, you can issue any command to your cluster, like requesting the nodes that are in the cluster. +The client and server version are reported, indicating that you have a local `kubectl` client and are able to request the server version from the newly built cluster. Now, you can issue [any kubectl command](https://kubernetes.io/docs/reference/kubectl/kubectl/) to your cluster, like requesting the nodes that are in the cluster. ``` $ kubectl --kubeconfig kube_config_cluster.yml get nodes