From 77e97036895981f8b31d3a2956687ab3c6aa9184 Mon Sep 17 00:00:00 2001 From: Sarah Alsmiller Date: Mon, 19 Aug 2024 11:45:57 -0500 Subject: [PATCH 1/5] bump envoy --- envoyextensions/xdscommon/ENVOY_VERSIONS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/envoyextensions/xdscommon/ENVOY_VERSIONS b/envoyextensions/xdscommon/ENVOY_VERSIONS index eef7f3100eab..264a0d56cfe8 100644 --- a/envoyextensions/xdscommon/ENVOY_VERSIONS +++ b/envoyextensions/xdscommon/ENVOY_VERSIONS @@ -8,7 +8,7 @@ # # See https://www.consul.io/docs/connect/proxies/envoy#supported-versions for more information on Consul's Envoy # version support. +1.31.0 +1.30.4 1.29.7 -1.28.5 -1.27.7 -1.26.8 \ No newline at end of file +1.28.5 \ No newline at end of file From e7376db58c5d0f3cd54b84c82cbb33a6a0ddacc4 Mon Sep 17 00:00:00 2001 From: Sarah Alsmiller Date: Mon, 19 Aug 2024 11:58:32 -0500 Subject: [PATCH 2/5] changelog --- .changelog/21616.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changelog/21616.txt diff --git a/.changelog/21616.txt b/.changelog/21616.txt new file mode 100644 index 000000000000..25a978e49bb1 --- /dev/null +++ b/.changelog/21616.txt @@ -0,0 +1,6 @@ +```release-note: improvement +connect: Add Envoy 1.31 and 1.30 to support matrix +``` +```release-note: breaking-change +connect: Removes support for Envoy 1.26 and 1.27 +``` \ No newline at end of file From 75c6e72f3c4255576d649115eb1a1ff36b688b0e Mon Sep 17 00:00:00 2001 From: sarahalsmiller <100602640+sarahalsmiller@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:03:39 -0500 Subject: [PATCH 3/5] drop breaking change note --- .changelog/21616.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/.changelog/21616.txt b/.changelog/21616.txt index 25a978e49bb1..f26b47c711d8 100644 --- a/.changelog/21616.txt +++ b/.changelog/21616.txt @@ -1,6 +1,3 @@ ```release-note: improvement connect: Add Envoy 1.31 and 1.30 to support matrix ``` -```release-note: breaking-change -connect: Removes support for Envoy 1.26 and 1.27 -``` \ No newline at end of file From 9bb4e11c6dcdea1854d41066b49de9c0f31b607d Mon Sep 17 00:00:00 2001 From: Sarah Alsmiller Date: Thu, 29 Aug 2024 11:47:05 -0500 Subject: [PATCH 4/5] update docs --- website/content/docs/connect/proxies/envoy.mdx | 1 + 1 file changed, 1 insertion(+) diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx index 2d2436df2075..8180787efbeb 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -58,6 +58,7 @@ apply to both Consul Enterprise and Consul community edition (CE). | Consul Version | Compatible Envoy Versions | | -------------- | -------------------------------------- | +| 1.20.x CE | 1.31.x, 1.30.x, 1.29.x, 1.28.x | | 1.19.x CE | 1.29.x, 1.28.x, 1.27.x, 1.26.x | | 1.18.x CE | 1.28.x, 1.27.x, 1.26.x, 1.25.x | | 1.17.x | 1.27.x, 1.26.x, 1.25.x, 1.24.x | From aefe6ef7e9cf72c5b015715f50ad074eff4aa51e Mon Sep 17 00:00:00 2001 From: Sarah Alsmiller Date: Thu, 12 Sep 2024 10:11:28 -0500 Subject: [PATCH 5/5] udpate port tests --- test-integ/connect/snapshot_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-integ/connect/snapshot_test.go b/test-integ/connect/snapshot_test.go index 423fa2534026..c8c2eb41acb7 100644 --- a/test-integ/connect/snapshot_test.go +++ b/test-integ/connect/snapshot_test.go @@ -155,7 +155,7 @@ func Test_Snapshot_Restore_Agentless(t *testing.T) { ) asserter.FortioFetch2HeaderEcho(t, staticClient, &topology.Upstream{ ID: staticServerSID, - LocalPort: 5000, + LocalPort: 8080, }) staticServer := sp.Topology().Clusters["dc1"].WorkloadByID( topology.NewNodeID("dc1-client1", "default"), @@ -184,6 +184,6 @@ func Test_Snapshot_Restore_Agentless(t *testing.T) { // Ensure the static-client connected to the new static-server asserter.FortioFetch2HeaderEcho(t, staticClient, &topology.Upstream{ ID: staticServerSID, - LocalPort: 5000, + LocalPort: 8080, }) }