From 5626f5cb1919043f147021ab043dae4a2fcfd58f Mon Sep 17 00:00:00 2001 From: TianChenjiang Date: Sat, 2 Apr 2022 19:02:15 +0800 Subject: [PATCH 1/3] update support Docker versions URL --- content/rke/latest/en/config-options/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rke/latest/en/config-options/_index.md b/content/rke/latest/en/config-options/_index.md index 30b0383d445..eea8bff7467 100644 --- a/content/rke/latest/en/config-options/_index.md +++ b/content/rke/latest/en/config-options/_index.md @@ -50,7 +50,7 @@ cluster_name: mycluster ### Supported Docker Versions -By default, RKE will check the installed Docker version on all hosts and fail with an error if the version is not supported by Kubernetes. The list of [supported Docker versions](https://github.com/rancher/rke/blob/master/docker/docker.go#L37-L41) are set specifically for each Kubernetes version. To override this behavior, set this option to `true`. +By default, RKE will check the installed Docker version on all hosts and fail with an error if the version is not supported by Kubernetes. The list of [supported Docker versions](https://github.com/rancher/kontainer-driver-metadata/blob/master/rke/k8s_docker_info.go#L3-L15) are set specifically for each Kubernetes version. To override this behavior, set this option to `true`. The default value is `false`. From 04b4117eac0c1e00341c4915c8bf82f352877957 Mon Sep 17 00:00:00 2001 From: Mars Tian Date: Fri, 22 Apr 2022 17:09:02 +0800 Subject: [PATCH 2/3] break the links by RKE version Co-authored-by: Jen Travinski --- content/rke/latest/en/config-options/_index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/rke/latest/en/config-options/_index.md b/content/rke/latest/en/config-options/_index.md index eea8bff7467..f742c9346d1 100644 --- a/content/rke/latest/en/config-options/_index.md +++ b/content/rke/latest/en/config-options/_index.md @@ -50,7 +50,9 @@ cluster_name: mycluster ### Supported Docker Versions -By default, RKE will check the installed Docker version on all hosts and fail with an error if the version is not supported by Kubernetes. The list of [supported Docker versions](https://github.com/rancher/kontainer-driver-metadata/blob/master/rke/k8s_docker_info.go#L3-L15) are set specifically for each Kubernetes version. To override this behavior, set this option to `true`. +By default, RKE will check the installed Docker version on all hosts and fail with an error if the version is not supported by Kubernetes. The list of supported Docker versions are set specifically for each Kubernetes version in kontainer-driver-metadata depending on the RKE version used (to override this behavior, set this option to `true`). Refer to the following: +- For RKE v1.3.x, see this [link](https://github.com/rancher/kontainer-driver-metadata/blob/release-v2.6/rke/k8s_docker_info.go for RKE v1.3.x) +- For RKE v1.2.x, see this [link](https://github.com/rancher/kontainer-driver-metadata/blob/release-v2.5/rke/k8s_docker_info.go) The default value is `false`. From 6ed682c4d610dc1abb602a18b0cd118007b104ba Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Fri, 22 Apr 2022 10:21:55 -0400 Subject: [PATCH 3/3] Updated for spacing, punctuation --- content/rke/latest/en/config-options/_index.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/content/rke/latest/en/config-options/_index.md b/content/rke/latest/en/config-options/_index.md index f742c9346d1..3fe0a5ab2eb 100644 --- a/content/rke/latest/en/config-options/_index.md +++ b/content/rke/latest/en/config-options/_index.md @@ -50,9 +50,10 @@ cluster_name: mycluster ### Supported Docker Versions -By default, RKE will check the installed Docker version on all hosts and fail with an error if the version is not supported by Kubernetes. The list of supported Docker versions are set specifically for each Kubernetes version in kontainer-driver-metadata depending on the RKE version used (to override this behavior, set this option to `true`). Refer to the following: -- For RKE v1.3.x, see this [link](https://github.com/rancher/kontainer-driver-metadata/blob/release-v2.6/rke/k8s_docker_info.go for RKE v1.3.x) -- For RKE v1.2.x, see this [link](https://github.com/rancher/kontainer-driver-metadata/blob/release-v2.5/rke/k8s_docker_info.go) +By default, RKE will check the installed Docker version on all hosts and fail with an error if the version is not supported by Kubernetes. The list of supported Docker versions is set specifically for each Kubernetes version in kontainer-driver-metadata depending on the RKE version used, as shown below. To override this behavior, set this option to `true`. Refer to the following: + +- For RKE v1.3.x, see this [link](https://github.com/rancher/kontainer-driver-metadata/blob/release-v2.6/rke/k8s_docker_info.go). +- For RKE v1.2.x, see this [link](https://github.com/rancher/kontainer-driver-metadata/blob/release-v2.5/rke/k8s_docker_info.go). The default value is `false`.