From ec6bf0281ea05e2e32e52db4d7f02e60fc520cb1 Mon Sep 17 00:00:00 2001 From: dnoland1 Date: Thu, 6 Sep 2018 22:35:45 -0700 Subject: [PATCH 1/3] Update _index.md Used https://github.com/rancher/rke/blob/v0.1.9/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go as a reference. --- content/rke/v0.1.x/en/config-options/_index.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/content/rke/v0.1.x/en/config-options/_index.md b/content/rke/v0.1.x/en/config-options/_index.md index 3d169c29e4d..b63c4471ed9 100644 --- a/content/rke/v0.1.x/en/config-options/_index.md +++ b/content/rke/v0.1.x/en/config-options/_index.md @@ -54,14 +54,16 @@ ignore_docker_version: true ### Kubernetes Version -You can select which version of Kubernetes to install for your cluster. These options are the Kubernetes versions made available in Rancher v2.x. The current default Kubernetes version used by RKE is `v1.10.3-rancher2-1`. If a version is defined in `kubernetes_version` and is not found in this list, the default is used. +You can select which version of Kubernetes to install for your cluster. These options are the Kubernetes versions made available in Rancher v2.x. The current default Kubernetes version used by RKE is `v1.11.1-rancher1-1`. If a version is defined in `kubernetes_version` and is not found in this list, the default is used. Kubernetes version| -----------------| + v1.11.1-rancher1-1| + v1.10.5-rancher1-2| v1.10.3-rancher2-1| v1.10.1-rancher2-1| v1.10.0-rancher1-1| - v1.9.7-rancher2-1| + v1.9.7-rancher2-2| v1.9.5-rancher1-1| v1.8.11-rancher2-1| v1.8.10-rancher1-1| @@ -74,7 +76,7 @@ There are two ways to select a Kubernetes version: - Using the configuration option `kubernetes_version` ```yaml -kubernetes_version: "v1.10.3-rancher2-1" +kubernetes_version: "v1.11.1-rancher1-1" ``` In case both are defined, the system images configuration will take precedence over `kubernetes_version`. From 238878d4c136e75385311626761618c8c4dfffb8 Mon Sep 17 00:00:00 2001 From: Denise Date: Fri, 7 Sep 2018 12:22:06 -0700 Subject: [PATCH 2/3] Update _index.md --- content/rke/v0.1.x/en/config-options/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/rke/v0.1.x/en/config-options/_index.md b/content/rke/v0.1.x/en/config-options/_index.md index b63c4471ed9..2f24b34738b 100644 --- a/content/rke/v0.1.x/en/config-options/_index.md +++ b/content/rke/v0.1.x/en/config-options/_index.md @@ -64,6 +64,7 @@ You can select which version of Kubernetes to install for your cluster. These op v1.10.1-rancher2-1| v1.10.0-rancher1-1| v1.9.7-rancher2-2| + v1.9.7-rancher2-1| v1.9.5-rancher1-1| v1.8.11-rancher2-1| v1.8.10-rancher1-1| From 298996cf4b8cd5ac8c37eac387cd90a412af18a8 Mon Sep 17 00:00:00 2001 From: dnoland1 Date: Fri, 7 Sep 2018 13:55:10 -0700 Subject: [PATCH 3/3] Update _index.md Name of docker container appears to be `etcd-rolling-snapshots`, not `etcd-snapshot`. ``` # docker ps | grep snapshot 5ceb51ca3587 rancher/rke-tools:v0.1.13 "/opt/rke-tools/rk..." 8 minutes ago Up 8 minutes etcd-rolling-snapshots ``` --- content/rke/v0.1.x/en/etcd-snapshots/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rke/v0.1.x/en/etcd-snapshots/_index.md b/content/rke/v0.1.x/en/etcd-snapshots/_index.md index 80b346fc933..cea49ba1d39 100644 --- a/content/rke/v0.1.x/en/etcd-snapshots/_index.md +++ b/content/rke/v0.1.x/en/etcd-snapshots/_index.md @@ -46,10 +46,10 @@ services: ``` -When a cluster is launched with the etcd snapshot service enabled, you can view the `etcd-snapshot` logs to confirm backups are being created automatically. +When a cluster is launched with the etcd snapshot service enabled, you can view the `etcd-rolling-snapshots` logs to confirm backups are being created automatically. ``` -$ docker logs etcd-snapshot +$ docker logs etcd-rolling-snapshots time="2018-05-04T18:39:16Z" level=info msg="Initializing Rolling Backups" creation=1m0s retention=24h0m0s time="2018-05-04T18:40:16Z" level=info msg="Created backup" name="2018-05-04T18:40:16Z_etcd" runtime=108.332814ms