Bump Envoy, remove support for unsupported versions (#21616)

* bump envoy * changelog * drop breaking change note * update docs * udpate port tests
hashicorp · Sep 12, 2024 · 320b708 · 320b708
1 parent 1a62917
commit 320b708
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.changelog/21616.txt b/.changelog/21616.txt
@@ -0,0 +1,3 @@
+```release-note: improvement
+connect: Add Envoy 1.31 and 1.30 to support matrix
+```
diff --git 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
+1.28.5
diff --git 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,
 	})
 }
diff --git 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         |