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

connect: Use Envoy 1.22.2 instead of 1.22.1 (#13444)

This commit is contained in:
Evan Culver 2022-06-14 15:29:41 -07:00 committed by GitHub
parent 81fff23841
commit ca7acd2970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -901,10 +901,10 @@ jobs:
environment: environment:
ENVOY_VERSION: "1.21.3" ENVOY_VERSION: "1.21.3"
envoy-integration-test-1_22_1: envoy-integration-test-1_22_2:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.22.1" ENVOY_VERSION: "1.22.2"
# run integration tests for the connect ca providers # run integration tests for the connect ca providers
test-connect-ca-providers: test-connect-ca-providers:
@ -1140,7 +1140,7 @@ workflows:
- envoy-integration-test-1_21_3: - envoy-integration-test-1_21_3:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_22_1: - envoy-integration-test-1_22_2:
requires: requires:
- dev-build - dev-build
- compatibility-integration-test: - compatibility-integration-test:

6
agent/xds/envoy_versioning_test.go
View File

@ -135,9 +135,9 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
*/ */
for _, v := range []string{ for _, v := range []string{
"1.19.0", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.19.5", "1.19.0", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.19.5",
"1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.3", "1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4",
"1.21.1", "1.21.2", "1.21.3", "1.21.0", "1.21.1", "1.21.2", "1.21.3",
"1.22.0", "1.22.1", "1.22.0", "1.22.1", "1.22.2",
} { } {
cases[v] = testcase{expect: supportedProxyFeatures{}} cases[v] = testcase{expect: supportedProxyFeatures{}}
} }

2
agent/xds/proxysupport/proxysupport.go
View File

@ -7,7 +7,7 @@ package proxysupport
// //
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{ var EnvoyVersions = []string{
"1.22.1", "1.22.2",
"1.21.3", "1.21.3",
"1.20.4", "1.20.4",
"1.19.5", "1.19.5",

2
test/integration/connect/envoy/run-tests.sh
View File

@ -10,7 +10,7 @@ readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
DEBUG=${DEBUG:-} DEBUG=${DEBUG:-}
# ENVOY_VERSION to run each test against # ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.22.1"} ENVOY_VERSION=${ENVOY_VERSION:-"1.22.2"}
export ENVOY_VERSION export ENVOY_VERSION
export DOCKER_BUILDKIT=1 export DOCKER_BUILDKIT=1

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

@ -36,7 +36,7 @@ Consul supports **four major Envoy releases** at the beginning of each major Con
| Consul Version | Compatible Envoy Versions | | Consul Version | Compatible Envoy Versions |
| ------------------- | -----------------------------------------------------------------------------------| | ------------------- | -----------------------------------------------------------------------------------|
| 1.12.x | 1.22.1, 1.21.3, 1.20.4, 1.19.5 | | 1.12.x | 1.22.2, 1.21.3, 1.20.4, 1.19.5 |
| 1.11.x | 1.20.2, 1.19.3, 1.18.6, 1.17.4<sup>1</sup> | | 1.11.x | 1.20.2, 1.19.3, 1.18.6, 1.17.4<sup>1</sup> |
| 1.10.x | 1.18.6, 1.17.4<sup>1</sup>, 1.16.5<sup>1</sup> , 1.15.5<sup>1</sup> | | 1.10.x | 1.18.6, 1.17.4<sup>1</sup>, 1.16.5<sup>1</sup> , 1.15.5<sup>1</sup> |