Skip to content

Commit

Permalink
connect: Add support for Envoy 1.20 (#11277)
Browse files Browse the repository at this point in the history
  • Loading branch information
eculver authored Oct 28, 2021
1 parent ab425e3 commit bec08f4
Show file tree
Hide file tree
Showing 188 changed files with 15 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/11277.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
connect: update supported envoy versions to 1.20.0, 1.19.1, 1.18.4, 1.17.4
```
8 changes: 8 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,11 @@ jobs:
environment:
ENVOY_VERSION: "1.19.1"

envoy-integration-test-1_20_0:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.20.0"

# run integration tests for the connect ca providers
test-connect-ca-providers:
docker:
Expand Down Expand Up @@ -1108,6 +1113,9 @@ workflows:
- envoy-integration-test-1_19_1:
requires:
- dev-build
- envoy-integration-test-1_20_0:
requires:
- dev-build

website:
unless: << pipeline.parameters.trigger-load-test >>
Expand Down
1 change: 1 addition & 0 deletions agent/xds/envoy_versioning_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
"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.19.0", "1.19.1",
"1.20.0",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}
Expand Down
1 change: 1 addition & 0 deletions agent/xds/proxysupport/proxysupport.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package proxysupport
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.20.0",
"1.19.1",
"1.18.4",
"1.17.4",
Expand Down
2 changes: 1 addition & 1 deletion test/integration/connect/envoy/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TEST_V2_XDS=${TEST_V2_XDS:-}
export TEST_V2_XDS

# ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.19.1"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.20.0"}
export ENVOY_VERSION

if [ ! -z "$DEBUG" ] ; then
Expand Down
2 changes: 1 addition & 1 deletion website/content/docs/connect/proxies/envoy.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ compatible Envoy versions.

| Consul Version | Compatible Envoy Versions |
| ------------------- | ------------------------------------------------------ |
| 1.11.x | 1.19.1, 1.18.4, 1.17.4, 1.16.5 |
| 1.11.x | 1.20.0, 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.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 |
Expand Down

0 comments on commit bec08f4

Please sign in to comment.