status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* bump envoy

* changelog

* drop breaking change note

* update docs

* udpate port tests
This commit is contained in:
sarahalsmiller 2024-09-12 10:32:18 -05:00 committed by GitHub
parent 1a62917ad1
commit 320b708b9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/21616.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note: improvement
connect: Add Envoy 1.31 and 1.30 to support matrix
```

4
envoyextensions/xdscommon/ENVOY_VERSIONS
View File

@ -8,7 +8,7 @@
# #
# See https://www.consul.io/docs/connect/proxies/envoy#supported-versions for more information on Consul's Envoy # See https://www.consul.io/docs/connect/proxies/envoy#supported-versions for more information on Consul's Envoy
# version support. # version support.
1.31.0
1.30.4
1.29.7 1.29.7
1.28.5 1.28.5
1.27.7
1.26.8

4
test-integ/connect/snapshot_test.go
View File

@ -155,7 +155,7 @@ func Test_Snapshot_Restore_Agentless(t *testing.T) {
) )
asserter.FortioFetch2HeaderEcho(t, staticClient, &topology.Upstream{ asserter.FortioFetch2HeaderEcho(t, staticClient, &topology.Upstream{
ID: staticServerSID, ID: staticServerSID,
LocalPort: 5000, LocalPort: 8080,
}) })
staticServer := sp.Topology().Clusters["dc1"].WorkloadByID( staticServer := sp.Topology().Clusters["dc1"].WorkloadByID(
topology.NewNodeID("dc1-client1", "default"), 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 // Ensure the static-client connected to the new static-server
asserter.FortioFetch2HeaderEcho(t, staticClient, &topology.Upstream{ asserter.FortioFetch2HeaderEcho(t, staticClient, &topology.Upstream{
ID: staticServerSID, ID: staticServerSID,
LocalPort: 5000, LocalPort: 8080,
}) })
} }

1
website/content/docs/connect/proxies/envoy.mdx
View File

@ -58,6 +58,7 @@ apply to both Consul Enterprise and Consul community edition (CE).
| Consul Version | Compatible Envoy Versions | | 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.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.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 | | 1.17.x | 1.27.x, 1.26.x, 1.25.x, 1.24.x |