github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Backport of Update list of Envoy versions into release/1.15.x (#16989) 

* backport of commit a59f68f51e

* backport of commit dace20a9e4

* backport of commit ad6e2a472b

* backport of commit b48c42a6cc

* backport of commit b913f60dee

---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
pull/16995/head
hc-github-team-consul-core 2023-04-12 18:08:45 -04:00 committed by GitHub
parent b787a829a3
commit d18e88056d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/16889.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: update supported envoy versions to 1.22.11, 1.23.8, 1.24.6, 1.25.4
```

8
.circleci/config.yml
View File

@ -12,10 +12,10 @@ parameters:
references:
envoy-versions: &supported_envoy_versions
- &default_envoy_version "1.22.7"
- "1.23.4"
- "1.24.2"
- "1.25.1"
- &default_envoy_version "1.22.11"
- "1.23.8"
- "1.24.6"
- "1.25.4"
nomad-versions: &supported_nomad_versions
- &default_nomad_version "1.3.3"
- "1.2.10"

8
envoyextensions/xdscommon/envoy_versioning_test.go
View File

@ -136,10 +136,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
}
*/
for _, v := range []string{
"1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5",
"1.23.0", "1.23.1", "1.23.2", "1.23.3", "1.23.4",
"1.24.0", "1.24.1", "1.24.2",
"1.25.0", "1.25.1",
"1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5", "1.22.6", "1.22.7", "1.22.8", "1.22.9", "1.22.10", "1.22.11",
"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.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6",
"1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4",
} {
cases[v] = testcase{expect: SupportedProxyFeatures{}}
}

8
envoyextensions/xdscommon/proxysupport.go
View File

@ -9,10 +9,10 @@ import "strings"
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.25.1",
"1.24.2",
"1.23.4",
"1.22.5",
"1.25.4",
"1.24.6",
"1.23.8",
"1.22.11",
}
// UnsupportedEnvoyVersions lists any unsupported Envoy versions (mainly minor versions) that fall

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

@ -39,7 +39,7 @@ Consul supports **four major Envoy releases** at the beginning of each major Con
| Consul Version | Compatible Envoy Versions |
| ------------------- | -----------------------------------------------------------------------------------|
| 1.15.x | 1.25.1, 1.24.2, 1.23.4, 1.22.5 |
| 1.15.x | 1.25.4, 1.24.6, 1.23.8, 1.22.11 |
| 1.14.x | 1.24.0, 1.23.1, 1.22.5, 1.21.5 |
| 1.13.x | 1.23.1, 1.22.5, 1.21.5, 1.20.7 |