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

Merge pull request #12449 from hashicorp/eculver/envoy-upgrades 

connect: Update supported Envoy versions to include 1.19.3 and 1.18.6
This commit is contained in:
Chris S. Kim 2022-02-25 14:25:45 -05:00 committed by GitHub
parent b3438c5d60 49a6109d96
commit ef929629cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/12449.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: Update supported Envoy versions to include 1.19.3 and 1.18.6
```

12
.circleci/config.yml
View File

@ -889,15 +889,15 @@ jobs:
path: *TEST_RESULTS_DIR
- run: *notify-slack-failure
envoy-integration-test-1_18_4:
envoy-integration-test-1_18_6:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.18.4"
ENVOY_VERSION: "1.18.6"
envoy-integration-test-1_19_1:
envoy-integration-test-1_19_3:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.19.1"
ENVOY_VERSION: "1.19.3"
envoy-integration-test-1_20_2:
<<: *ENVOY_TESTS
@ -1148,10 +1148,10 @@ workflows:
- envoy-integration-test-1_17_4:
requires:
- dev-build
- envoy-integration-test-1_18_4:
- envoy-integration-test-1_18_6:
requires:
- dev-build
- envoy-integration-test-1_19_1:
- envoy-integration-test-1_19_3:
requires:
- dev-build
- envoy-integration-test-1_20_2:

4
agent/xds/envoy_versioning_test.go
View File

@ -124,14 +124,14 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
// Populate feature flags here when appropriate. See consul 1.10.x for reference.
for _, v := range []string{
"1.17.0", "1.17.1", "1.17.2", "1.17.3", "1.17.4",
"1.18.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4",
"1.18.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4", "1.18.5", "1.18.6",
} {
cases[v] = testcase{expect: supportedProxyFeatures{
ForceLDSandCDSToAlwaysUseWildcardsOnReconnect: true,
}}
}
for _, v := range []string{
"1.19.0", "1.19.1",
"1.19.0", "1.19.1", "1.19.2", "1.19.3",
"1.20.0", "1.20.1", "1.20.2",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}

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

@ -8,7 +8,7 @@ package proxysupport
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.20.2",
"1.19.1",
"1.18.4",
"1.19.3",
"1.18.6",
"1.17.4",
}

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

@ -179,10 +179,14 @@ function assert_envoy_version {
echo "Got version=$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'
# 1.20.2, 1.19.3 and 1.18.6 are special snowflakes in that the version for
# the release is reported with a '-dev' suffix (eg 1.20.2-dev).
if [ "$ENVOY_VERSION" = "1.20.2" ] ; then
ENVOY_VERSION="1.20.2-dev"
elif [ "$ENVOY_VERSION" = "1.19.3" ] ; then
ENVOY_VERSION="1.19.3-dev"
elif [ "$ENVOY_VERSION" = "1.18.6" ] ; then
ENVOY_VERSION="1.18.6-dev"
fi
echo $VERSION | grep "/$ENVOY_VERSION/"

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

@ -35,7 +35,7 @@ compatible Envoy versions.
| Consul Version | Compatible Envoy Versions |
| ------------------- | ------------------------------------------------------ |
| 1.11.x | 1.20.2, 1.19.1, 1.18.4, 1.17.4 |
| 1.11.x | 1.20.2, 1.19.3, 1.18.6, 1.17.4 |
| 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.8.x | 1.14.7, 1.13.7, 1.12.7, 1.11.2 |