From 768648f066acb97c976f358e3d91b0c7f626b0f6 Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Wed, 11 Jan 2023 12:13:28 -0500 Subject: [PATCH] backport of commit 4420869997f2c6f6746c44a36ef29631a1b2d97d (#15939) Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com> --- website/content/docs/upgrading/upgrade-specific.mdx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index 2b0369db6f..910275b1fa 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -19,10 +19,12 @@ upgrade flow. ### Service Mesh Compatibility Prior to Consul 1.14, cluster peering or Consul connect were disabled by default. A breaking change was made in Consul 1.14 that: -- [Cluster Peering is enabled by default.](/docs/connect/cluster-peering) To disable, set -[`peering.enabled`](/docs/agent/config/config-files#peering_enabled) to `false`. -- [Consul Connect is enabled by default.](/docs/connect) To disable, set -[`connect.enabled`](/docs/agent/config/config-files#connect_enabled) to `false`. +- [Cluster Peering is enabled by default.](/docs/connect/cluster-peering) + Cluster peering and WAN federation can coexist, + so there is no need to disable cluster peering to upgrade existing WAN federated datacenters. + To disable cluster peering nonetheless, set [`peering.enabled`](/docs/agent/config/config-files#peering_enabled) to `false`. +- [Consul Connect is enabled by default.](/docs/connect) + To disable, set [`connect.enabled`](/docs/agent/config/config-files#connect_enabled) to `false`. The changes to Consul service mesh in version 1.14 are incompatible with Nomad 1.4.2 and earlier. If you operate Consul service mesh using Nomad 1.4.2 or earlier, do not upgrade to Consul 1.14 until