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

connect: Upgrade Envoy 1.20 to 1.20.2 (#12443)

This commit is contained in:
Evan Culver 2022-02-24 16:19:39 -08:00 committed by GitHub
parent 4b0f657b31
commit 9f4d9f3f74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/12443.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: update Envoy supported version of 1.20 to 1.20.2
```

6
.circleci/config.yml
View File

@ -899,10 +899,10 @@ jobs:
environment: environment:
ENVOY_VERSION: "1.19.1" ENVOY_VERSION: "1.19.1"
envoy-integration-test-1_20_1: envoy-integration-test-1_20_2:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.20.1" ENVOY_VERSION: "1.20.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:
@ -1154,7 +1154,7 @@ workflows:
- envoy-integration-test-1_19_1: - envoy-integration-test-1_19_1:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_20_1: - envoy-integration-test-1_20_2:
requires: requires:
- dev-build - dev-build

2
agent/xds/envoy_versioning_test.go
View File

@ -132,7 +132,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
} }
for _, v := range []string{ for _, v := range []string{
"1.19.0", "1.19.1", "1.19.0", "1.19.1",
"1.20.0", "1.20.1", "1.20.0", "1.20.1", "1.20.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.20.1", "1.20.2",
"1.19.1", "1.19.1",
"1.18.4", "1.18.4",
"1.17.4", "1.17.4",

7
test/integration/connect/envoy/helpers.bash
View File

@ -178,6 +178,13 @@ function assert_envoy_version {
echo "---" echo "---"
echo "Got version=$VERSION" echo "Got version=$VERSION"
echo "Want version=$ENVOY_VERSION" echo "Want version=$ENVOY_VERSION"
# 1.20.2 is a special snowflake in that the version for the release is actually
# reported as '1.20.2-dev'
if [ "$ENVOY_VERSION" = "1.20.2" ] ; then
ENVOY_VERSION="1.20.2-dev"
fi
echo $VERSION | grep "/$ENVOY_VERSION/" echo $VERSION | grep "/$ENVOY_VERSION/"
} }

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.20.1"} ENVOY_VERSION=${ENVOY_VERSION:-"1.20.2"}
export ENVOY_VERSION export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then if [ ! -z "$DEBUG" ] ; then

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

@ -35,7 +35,7 @@ compatible Envoy versions.
| Consul Version | Compatible Envoy Versions | | Consul Version | Compatible Envoy Versions |
| ------------------- | ------------------------------------------------------ | | ------------------- | ------------------------------------------------------ |
| 1.11.x | 1.20.1, 1.19.1, 1.18.4, 1.17.4 | | 1.11.x | 1.20.2, 1.19.1, 1.18.4, 1.17.4 |
| 1.10.x | 1.18.4, 1.17.4, 1.16.5, 1.15.5 | | 1.10.x | 1.18.4, 1.17.4, 1.16.5, 1.15.5 |
| 1.9.x | 1.16.5, 1.15.5, 1.14.7<sup>1</sup>, 1.13.7<sup>1</sup> | | 1.9.x | 1.16.5, 1.15.5, 1.14.7<sup>1</sup>, 1.13.7<sup>1</sup> |
| 1.8.x | 1.14.7, 1.13.7, 1.12.7, 1.11.2 | | 1.8.x | 1.14.7, 1.13.7, 1.12.7, 1.11.2 |