From 22bdabf4ba9e888fa27c1a84f8c7ba8ba9ed8b65 Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Tue, 6 Nov 2018 14:19:44 -0800 Subject: [PATCH 1/3] Fixed wording for "large version mismatches." --- ee/upgrade.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/upgrade.md b/ee/upgrade.md index 5bd4a06239..f39dab0b2f 100644 --- a/ee/upgrade.md +++ b/ee/upgrade.md @@ -19,8 +19,8 @@ architecture in Swarm to increase the performance and scale of the built-in load Docker Engine - Enterprise upgrades in Swarm clusters should follow these guidelines in order to avoid IP address space exhaustion and associated application downtime. -* New workloads should not be actively scheduled in the cluster during upgrades. -* Large version mismatches between managers and workers can cause unintended consequences when new workloads are scheduled. +* New workloads should not be actively scheduled in the cluster during upgrades. Major and minor version +mismatches between managers and workers can cause unintended consequences when new workloads are scheduled. * Manager nodes should all be upgraded first before upgrading worker nodes. Upgrading manager nodes sequentially is recommended if live workloads are running in the cluster during the upgrade. * Once manager nodes are upgraded worker nodes should be upgraded next and then the Swarm cluster upgrade is complete. * If running UCP, the UCP upgrade should follow once all of the Swarm engines have been upgraded. From 0d9aebc863389c380d295930688fda3fed8b9adb Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Wed, 7 Nov 2018 08:12:50 -0800 Subject: [PATCH 2/3] Update upgrade.md --- ee/upgrade.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/upgrade.md b/ee/upgrade.md index f39dab0b2f..0956d0e3d6 100644 --- a/ee/upgrade.md +++ b/ee/upgrade.md @@ -19,8 +19,8 @@ architecture in Swarm to increase the performance and scale of the built-in load Docker Engine - Enterprise upgrades in Swarm clusters should follow these guidelines in order to avoid IP address space exhaustion and associated application downtime. -* New workloads should not be actively scheduled in the cluster during upgrades. Major and minor version -mismatches between managers and workers can cause unintended consequences when new workloads are scheduled. +* New workloads should not be actively scheduled in the cluster during upgrades. +* Differences in the major (X.y.z.) or minor (x.Y.z) version numbers between the managers and workers can cause mismatches between managers and workers can cause unintended consequences when new workloads are scheduled. * Manager nodes should all be upgraded first before upgrading worker nodes. Upgrading manager nodes sequentially is recommended if live workloads are running in the cluster during the upgrade. * Once manager nodes are upgraded worker nodes should be upgraded next and then the Swarm cluster upgrade is complete. * If running UCP, the UCP upgrade should follow once all of the Swarm engines have been upgraded. From ec8c9888d3ec5b14c574ea9d7affad0ca1e07790 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Wed, 7 Nov 2018 08:14:11 -0800 Subject: [PATCH 3/3] Update upgrade.md --- ee/upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/upgrade.md b/ee/upgrade.md index 0956d0e3d6..996a0211e8 100644 --- a/ee/upgrade.md +++ b/ee/upgrade.md @@ -20,7 +20,7 @@ Docker Engine - Enterprise upgrades in Swarm clusters should follow these guidel space exhaustion and associated application downtime. * New workloads should not be actively scheduled in the cluster during upgrades. -* Differences in the major (X.y.z.) or minor (x.Y.z) version numbers between the managers and workers can cause mismatches between managers and workers can cause unintended consequences when new workloads are scheduled. +* Differences in the major (X.y.z.) or minor (x.Y.z) version numbers between the managers and workers can cause unintended consequences when new workloads are scheduled. * Manager nodes should all be upgraded first before upgrading worker nodes. Upgrading manager nodes sequentially is recommended if live workloads are running in the cluster during the upgrade. * Once manager nodes are upgraded worker nodes should be upgraded next and then the Swarm cluster upgrade is complete. * If running UCP, the UCP upgrade should follow once all of the Swarm engines have been upgraded.