luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

release/1.16.x - Update supported Envoy versions (#19273)

This commit is contained in:
Chris Thain 2023-10-19 14:45:33 -07:00 committed by GitHub
parent abb6ce3bc9
commit 963f609b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/19273.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:security
connect: update supported envoy versions to 1.24.12, 1.25.11, 1.26.6 to address [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76)
```

4
.github/workflows/test-integrations.yml vendored
View File

@ -260,7 +260,7 @@ jobs:
# this is further going to multiplied in envoy-integration tests by the
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be
# multiplied by 8 based on these values:
# envoy-version: ["1.23.12", "1.24.10", "1.25.9", "1.26.4"]
# envoy-version: ["1.23.12", "1.24.12", "1.25.11", "1.26.6"]
# xds-target: ["server", "client"]
TOTAL_RUNNERS: 4
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@ -294,7 +294,7 @@ jobs:
strategy:
fail-fast: false
matrix:
envoy-version: ["1.26.4"]
envoy-version: ["1.26.6"]
xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env:

6
envoyextensions/xdscommon/envoy_versioning_test.go
View File

@ -152,9 +152,9 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
*/
for _, v := range []string{
"1.23.0", "1.23.1", "1.23.2", "1.23.3", "1.23.4", "1.23.5", "1.23.6", "1.23.7", "1.23.8", "1.23.9", "1.23.10", "1.23.11", "1.23.12",
"1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", "1.24.7", "1.24.8", "1.24.9", "1.24.10",
"1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", "1.25.5", "1.25.6", "1.25.7", "1.25.8", "1.25.9",
"1.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4",
"1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", "1.24.7", "1.24.8", "1.24.9", "1.24.10", "1.24.11", "1.24.12",
"1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", "1.25.5", "1.25.6", "1.25.7", "1.25.8", "1.25.9", "1.25.10", "1.25.11",
"1.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4", "1.26.5", "1.26.6",
} {
cases[v] = testcase{expect: SupportedProxyFeatures{}}
}

6
envoyextensions/xdscommon/proxysupport.go
View File

@ -12,9 +12,9 @@ import "strings"
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.26.4",
"1.25.9",
"1.24.10",
"1.26.6",
"1.25.11",
"1.24.12",
"1.23.12",
}

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

@ -39,9 +39,9 @@ Consul supports **four major Envoy releases** at the beginning of each major Con
| Consul Version | Compatible Envoy Versions |
| ------------------- | -----------------------------------------------------------------------------------|
| 1.16.x | 1.26.4, 1.25.9, 1.24.10, 1.23.12 |
| 1.15.x | 1.25.9, 1.24.10, 1.23.12, 1.22.11 |
| 1.14.x | 1.24.10, 1.23.12, 1.22.11, 1.21.6 |
| 1.16.x | 1.26.6, 1.25.11, 1.24.12, 1.23.12 |
| 1.15.x | 1.25.11, 1.24.12, 1.23.12, 1.22.11 |
| 1.14.x | 1.24.12, 1.23.12, 1.22.11, 1.21.6 |
### Envoy and Consul Dataplane