From ec0e5821e46450a0a1e4dc91bb5a5486b13a39e7 Mon Sep 17 00:00:00 2001 From: Yann Bizeul Date: Sun, 21 Oct 2018 10:22:00 +0200 Subject: [PATCH 01/11] Added `ros udev-settle` to create block devices --- content/os/v1.x/en/about/recovery-console/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/os/v1.x/en/about/recovery-console/_index.md b/content/os/v1.x/en/about/recovery-console/_index.md index f2c5f434405..8d70dfe2704 100644 --- a/content/os/v1.x/en/about/recovery-console/_index.md +++ b/content/os/v1.x/en/about/recovery-console/_index.md @@ -72,6 +72,7 @@ You need add `rancher.autologin=tty1` to the end, then press ``. If all g We need to mount the root disk in the recovery console and delete some data: ``` +$ ros udev-settle $ mkdir /mnt/root-disk $ mount /dev/sda1 /mnt/root-disk From 1c1c3a6a7901b396bb80395f43ffa80765ee4f5b Mon Sep 17 00:00:00 2001 From: niusmallnan Date: Wed, 24 Oct 2018 08:11:48 +0800 Subject: [PATCH 02/11] Remove Persisting State part in boot-from-iso --- .../workstation/boot-from-iso/_index.md | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/content/os/v1.x/en/installation/running-rancheros/workstation/boot-from-iso/_index.md b/content/os/v1.x/en/installation/running-rancheros/workstation/boot-from-iso/_index.md index 2dbe8773753..5df0f0d6fb6 100644 --- a/content/os/v1.x/en/installation/running-rancheros/workstation/boot-from-iso/_index.md +++ b/content/os/v1.x/en/installation/running-rancheros/workstation/boot-from-iso/_index.md @@ -10,18 +10,3 @@ You must boot with at least **1280MB** of memory. If you boot with the ISO, you ### Install to Disk After you boot RancherOS from ISO, you can follow the instructions [here]({{< baseurl >}}/os/v1.x/en/installation/running-rancheros/server/install-to-disk/) to install RancherOS to a hard disk. - -### Persisting State - -If you are running from the ISO, RancherOS will be running from memory. All downloaded Docker images, for example, will be stored in a ramdisk and will be lost after the server is rebooted. You can -create a file system with the label `RANCHER_STATE` to instruct RancherOS to use that partition to store state. Suppose you have a disk partition on the server called `/dev/sda`, the following command formats that partition and labels it `RANCHER_STATE` - -``` -$ sudo mkfs.ext4 -L RANCHER_STATE /dev/sda -# Reboot afterwards in order for the changes to start being saved. -$ sudo reboot -``` - -After you reboot, the server RancherOS will use `/dev/sda` as the state partition. - -> **Note:** If you are installing RancherOS to disk, you do not need to run this command. From f07f93a48af7bcab277352556238e536419bc777 Mon Sep 17 00:00:00 2001 From: Russell Sherman <32712961+russellatuniondashpos@users.noreply.github.com> Date: Wed, 24 Oct 2018 15:48:40 -0500 Subject: [PATCH 03/11] correct typo of RANCHER_STATE --- content/os/v1.x/en/about/custom-partition-layout/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/os/v1.x/en/about/custom-partition-layout/_index.md b/content/os/v1.x/en/about/custom-partition-layout/_index.md index 698400771f7..a1c43205ed8 100644 --- a/content/os/v1.x/en/about/custom-partition-layout/_index.md +++ b/content/os/v1.x/en/about/custom-partition-layout/_index.md @@ -49,7 +49,7 @@ $ reboot ### Use RANCHER_BOOT partition -When you only use the RRACHER_STATE partition, the bootloader will be installed in the `/boot` directory. +When you only use the RANCHER_STATE partition, the bootloader will be installed in the `/boot` directory. ``` $ system-docker run -it --rm -v /:/host alpine From e626cfc8630d27949b33d54c023922d3ed4fc4b1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Fri, 26 Oct 2018 23:36:43 +0200 Subject: [PATCH 04/11] Add FAQ entry on pod eviction --- content/rancher/v2.x/en/faq/technical/_index.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/content/rancher/v2.x/en/faq/technical/_index.md b/content/rancher/v2.x/en/faq/technical/_index.md index 2ead99f4b86..e82d4ac0ce2 100644 --- a/content/rancher/v2.x/en/faq/technical/_index.md +++ b/content/rancher/v2.x/en/faq/technical/_index.md @@ -123,3 +123,16 @@ When the node is removed from the cluster, and the node is cleaned, you can read ### How can I add additional arguments/binds/environment variables to Kubernetes components in a Rancher Launched Kubernetes cluster? You can add additional arguments/binds/environment variables via the [Config File]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/#config-file) option in Cluster Options. For more information, see the [Extra Args, Extra Binds, and Extra Environment Variables]({{< baseurl >}}/rke/v0.1.x/en/config-options/services/services-extras/) in the RKE documentation or browse the [Example Cluster.ymls]({{< baseurl >}}/rke/v0.1.x/en/example-yamls/). + +### Why does it take 5+ minutes for a pod to be rescheduled when a node has failed? + +This is due to a combination of the following default Kubernetes settings: + +* kubelet + * `node-status-update-frequency`: Specifies how often kubelet posts node status to master (default 10s) +* kube-controller-manager + * `node-monitor-period`: The period for syncing NodeStatus in NodeController (default 5s) + * `node-monitor-grace-period`: Amount of time which we allow running Node to be unresponsive before marking it unhealthy (default 40s) + * `pod-eviction-timeout`: The grace period for deleting pods on failed nodes (default 5m0s) + +See [Kubernetes: kubelet](https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/) and [Kubernetes: kube-controller-manager](https://kubernetes.io/docs/reference/command-line-tools-reference/kube-controller-manager/) for more information on these settings. From 945057e59f048dd9b416dbc8b2bc2b8ad59a3f7a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Tue, 30 Oct 2018 13:48:48 +0100 Subject: [PATCH 05/11] Expand note for HA cluster for Rancher --- content/rancher/v2.x/en/installation/ha/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/ha/_index.md b/content/rancher/v2.x/en/installation/ha/_index.md index 24fe7a7b010..77eacd64a7a 100644 --- a/content/rancher/v2.x/en/installation/ha/_index.md +++ b/content/rancher/v2.x/en/installation/ha/_index.md @@ -7,7 +7,7 @@ For production environments, we recommend installing Rancher in a high-availabil This procedure walks you through setting up a 3-node cluster with RKE and installing the Rancher chart with the Helm package manager. -> **Important:** For the best performance, we recommend this Kubernetes cluster to be dedicated only to run Rancher. +> **Important:** For the best performance, we recommend this Kubernetes cluster to be dedicated only to run Rancher. After the Kubernetes cluster to run Rancher is setup, you can [create or import clusters]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/#cluster-creation-in-rancher) for running your workloads. ## Recommended Architecture From 7aabf46c98a4c070fc73a912ef6eebe49c475cd9 Mon Sep 17 00:00:00 2001 From: Denise Date: Wed, 31 Oct 2018 13:37:07 -0700 Subject: [PATCH 06/11] Update _index.md --- .../v2.x/en/installation/ha/helm-init/_index.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 14f3f7b86cd..73cfec3a0e6 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -23,17 +23,11 @@ kubectl create clusterrolebinding tiller \ --serviceaccount=kube-system:tiller helm init --service-account tiller - -# For chinese users -# The latest version of tiller images queries addresses: -# https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085 - -helm init --service-account tiller \ - --tiller-image registry.cn-hangzhou.aliyuncs.com/google_containers/tiller: - ``` -> **Note:** This`tiller`install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. +> **Users in China:** The latest version of tiller image queries a specific address (i.e. `https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085`). In order to initialize tiller, you'll need to specify a specific tiller image. `helm init --service-account tiller --tiller-image registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:` + +> **Note:** This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. ### Issues or errors? From 51990e8955f55ecd9a8ce6e6f02c07aa6cbf8dea Mon Sep 17 00:00:00 2001 From: Denise Date: Wed, 31 Oct 2018 13:40:46 -0700 Subject: [PATCH 07/11] Update _index.md --- .../rancher/v2.x/en/installation/ha/helm-init/_index.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 73cfec3a0e6..1377e477c35 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -23,9 +23,14 @@ kubectl create clusterrolebinding tiller \ --serviceaccount=kube-system:tiller helm init --service-account tiller -``` -> **Users in China:** The latest version of tiller image queries a specific address (i.e. `https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085`). In order to initialize tiller, you'll need to specify a specific tiller image. `helm init --service-account tiller --tiller-image registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:` +# Note: If you are in China, you'll need to specify a specific tiller-image in order to initialize tiller. +# The list of tiller image tags are available here: https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085. +# When initializing tiller, you'll need to pass in --tiller-image + +helm init --service-account tiller | +--tiller-image registry.cn-hangzhou.aliyuncs.com/google_containers/tiller: +``` > **Note:** This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. From 501b78a939dd2913c7e7daf41ebf35e22b1dc414 Mon Sep 17 00:00:00 2001 From: Denise Date: Wed, 31 Oct 2018 13:41:39 -0700 Subject: [PATCH 08/11] Update _index.md --- content/rancher/v2.x/en/installation/ha/helm-init/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 1377e477c35..27f3b746020 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -24,7 +24,7 @@ kubectl create clusterrolebinding tiller \ helm init --service-account tiller -# Note: If you are in China, you'll need to specify a specific tiller-image in order to initialize tiller. +# Users in China: You will need to specify a specific tiller-image in order to initialize tiller. # The list of tiller image tags are available here: https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085. # When initializing tiller, you'll need to pass in --tiller-image From a3855dbc5b52bf075cfc10a28404b8e3df9460fb Mon Sep 17 00:00:00 2001 From: Denise Date: Wed, 31 Oct 2018 13:44:23 -0700 Subject: [PATCH 09/11] Update _index.md --- content/os/v1.x/en/about/recovery-console/_index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/os/v1.x/en/about/recovery-console/_index.md b/content/os/v1.x/en/about/recovery-console/_index.md index 8d70dfe2704..ad5fea9bc34 100644 --- a/content/os/v1.x/en/about/recovery-console/_index.md +++ b/content/os/v1.x/en/about/recovery-console/_index.md @@ -72,7 +72,9 @@ You need add `rancher.autologin=tty1` to the end, then press ``. If all g We need to mount the root disk in the recovery console and delete some data: ``` +# If you couldn't see any disk devices created under `/dev/`, please try this command: $ ros udev-settle + $ mkdir /mnt/root-disk $ mount /dev/sda1 /mnt/root-disk From 662a10aa978eb531aa3fca66359a3551a5439d7f Mon Sep 17 00:00:00 2001 From: niusmallnan Date: Wed, 7 Nov 2018 16:23:25 +0800 Subject: [PATCH 10/11] Custom the file path of system-docker logs --- .../en/installation/configuration/docker/_index.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/content/os/v1.x/en/installation/configuration/docker/_index.md b/content/os/v1.x/en/installation/configuration/docker/_index.md index 33eddaefdba..14b5953e734 100644 --- a/content/os/v1.x/en/installation/configuration/docker/_index.md +++ b/content/os/v1.x/en/installation/configuration/docker/_index.md @@ -101,6 +101,18 @@ The docker-sys bridge can be configured with system-docker args, it will take ef $ ros config set rancher.system_docker.bip 172.18.43.1/16 ``` +_Available as of v1.4_ + +The default path of system-docker logs is `/var/log/system-docker.log`. If you want to write system-docker logs to a separate partition, +such as [RANCHE_OEM partition]({{< baseurl >}}/os/v1.x/en/about/custom-partition-layout/#use-rancher-oem-partition), you can try `rancher.defaults.system_docker_logs`: + +``` +#cloud-config +rancher: + defaults: + system_docker_logs: /usr/share/ros/oem/system-docker.log +``` + ### Using a pull through registry mirror There are 3 Docker engines that can be configured to use the pull-through Docker Hub registry mirror cache: From 03490244d38086406064a0850d629038b48fc51c Mon Sep 17 00:00:00 2001 From: Denise Date: Wed, 7 Nov 2018 21:09:48 -0800 Subject: [PATCH 11/11] Update _index.md --- .../v1.x/en/installation/configuration/docker/_index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/os/v1.x/en/installation/configuration/docker/_index.md b/content/os/v1.x/en/installation/configuration/docker/_index.md index 14b5953e734..1dbd9c3e21a 100644 --- a/content/os/v1.x/en/installation/configuration/docker/_index.md +++ b/content/os/v1.x/en/installation/configuration/docker/_index.md @@ -93,7 +93,7 @@ Key | Value | Default | Description `extra_args` | List of Strings | `[]` | Arbitrary daemon arguments, appended to the generated command `environment` | List of Strings (optional) | `[]` | -_Available as of v1.4_ +_Available as of v1.4.x_ The docker-sys bridge can be configured with system-docker args, it will take effect after reboot. @@ -101,10 +101,10 @@ The docker-sys bridge can be configured with system-docker args, it will take ef $ ros config set rancher.system_docker.bip 172.18.43.1/16 ``` -_Available as of v1.4_ +_Available as of v1.4.x_ -The default path of system-docker logs is `/var/log/system-docker.log`. If you want to write system-docker logs to a separate partition, -such as [RANCHE_OEM partition]({{< baseurl >}}/os/v1.x/en/about/custom-partition-layout/#use-rancher-oem-partition), you can try `rancher.defaults.system_docker_logs`: +The default path of system-docker logs is `/var/log/system-docker.log`. If you want to write the system-docker logs to a separate partition, +e.g. [RANCHE_OEM partition]({{< baseurl >}}/os/v1.x/en/about/custom-partition-layout/#use-rancher-oem-partition), you can try `rancher.defaults.system_docker_logs`: ``` #cloud-config