From e4538444e7f47d8851e9aae9a902cfdb20c060a7 Mon Sep 17 00:00:00 2001 From: catherineluse Date: Tue, 10 Dec 2019 16:05:24 -0700 Subject: [PATCH] Remove references to specific Rancher and Docker versions --- .../en/cluster-provisioning/node-requirements/_index.md | 6 ++---- content/rancher/v2.x/en/installation/requirements/_index.md | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/content/rancher/v2.x/en/cluster-provisioning/node-requirements/_index.md b/content/rancher/v2.x/en/cluster-provisioning/node-requirements/_index.md index be5fdfe6cf5..a3ae41d0c57 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/node-requirements/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/node-requirements/_index.md @@ -19,7 +19,7 @@ Make sure the nodes for the Rancher server fulfill the following requirements: Rancher should work with any modern Linux distribution and any modern Docker version. Linux is required for the etcd and controlplane nodes of all downstream clusters. Worker nodes may run Linux or [Windows Server.](#requirements-for-windows-nodes) The capability to use Windows worker nodes in downstream clusters was added in Rancher v2.3.0. -Rancher works has been tested with downstream clusters running Ubuntu, CentOS, Oracle Linux, RancherOS, and RedHat Enterprise Linux. For details on which OS and Docker versions were tested with each Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/all-supported-versions/rancher-v2.3.0/) +Rancher works has been tested and is supported with downstream clusters running Ubuntu, CentOS, Oracle Linux, RancherOS, and RedHat Enterprise Linux. For details on which OS and Docker versions were tested with each Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) All supported operating systems are 64-bit x86. @@ -33,9 +33,7 @@ For information on how to install Docker, refer to the offical [Docker documenta _Windows worker nodes can be used as of Rancher v2.3.0_ -Nodes with Windows Server core version 1809 should use Docker EE-basic 18.09 (1809) or Docker EE-basic 19.03 (1903). - -Nodes with Windows Server core version 1903 should use Docker EE-basic 19.03. +Nodes with Windows Server must run Docker Enterprise Edition. Windows nodes can be used for worker nodes only. See [Configuring Custom Clusters for Windows]({{}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/windows-clusters/) diff --git a/content/rancher/v2.x/en/installation/requirements/_index.md b/content/rancher/v2.x/en/installation/requirements/_index.md index c31ed07a256..58da1f13b08 100644 --- a/content/rancher/v2.x/en/installation/requirements/_index.md +++ b/content/rancher/v2.x/en/installation/requirements/_index.md @@ -26,9 +26,9 @@ For a list of best practices that we recommend for running the Rancher server in Rancher should work with any modern Linux distribution and any modern Docker version. -Rancher has been tested with Ubuntu, CentOS, Oracle Linux, RancherOS, and RedHat Enterprise Linux. +Rancher has been tested and is supported with Ubuntu, CentOS, Oracle Linux, RancherOS, and RedHat Enterprise Linux. -For details on which OS and Docker versions were tested with each Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/all-supported-versions/rancher-v2.3.0/) +For details on which OS and Docker versions were tested with each Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) All supported operating systems are 64-bit x86.