status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

connect: Update Envoy support matrix to latest patch releases (#13431)

This commit is contained in:
Evan Culver 2022-06-14 13:19:09 -07:00 committed by GitHub
parent a0a49ce2a6
commit ba6136eb42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/13431.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: Update Envoy support matrix to latest patch releases (1.22.2, 1.21.3, 1.20.4, 1.19.5)
```

24
.circleci/config.yml
View File

@ -852,13 +852,13 @@ jobs:
path: *TEST_RESULTS_DIR path: *TEST_RESULTS_DIR
- run: *notify-slack-failure - run: *notify-slack-failure
envoy-integration-test-1_19_3: &ENVOY_TESTS envoy-integration-test-1_19_5: &ENVOY_TESTS
machine: machine:
image: *UBUNTU_CI_IMAGE image: *UBUNTU_CI_IMAGE
parallelism: 4 parallelism: 4
resource_class: medium resource_class: medium
environment: environment:
ENVOY_VERSION: "1.19.3" ENVOY_VERSION: "1.19.5"
steps: &ENVOY_INTEGRATION_TEST_STEPS steps: &ENVOY_INTEGRATION_TEST_STEPS
- checkout - checkout
# Get go binary from workspace # Get go binary from workspace
@ -891,20 +891,20 @@ jobs:
path: *TEST_RESULTS_DIR path: *TEST_RESULTS_DIR
- run: *notify-slack-failure - run: *notify-slack-failure
envoy-integration-test-1_20_2: envoy-integration-test-1_20_4:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.20.2" ENVOY_VERSION: "1.20.4"
envoy-integration-test-1_21_1: envoy-integration-test-1_21_3:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.21.1" ENVOY_VERSION: "1.21.3"
envoy-integration-test-1_22_0: envoy-integration-test-1_22_1:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.22.0" ENVOY_VERSION: "1.22.1"
# run integration tests for the connect ca providers # run integration tests for the connect ca providers
test-connect-ca-providers: test-connect-ca-providers:
@ -1131,16 +1131,16 @@ workflows:
- nomad-integration-0_8: - nomad-integration-0_8:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_19_3: - envoy-integration-test-1_19_5:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_20_2: - envoy-integration-test-1_20_4:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_21_1: - envoy-integration-test-1_21_3:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_22_0: - envoy-integration-test-1_22_1:
requires: requires:
- dev-build - dev-build
- compatibility-integration-test: - compatibility-integration-test:

8
agent/xds/envoy_versioning_test.go
View File

@ -134,10 +134,10 @@ 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.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.0", "1.20.1", "1.20.2", "1.20.3", "1.20.3",
"1.21.1", "1.21.1", "1.21.2", "1.21.3",
"1.22.0", "1.22.0", "1.22.1",
} { } {
cases[v] = testcase{expect: supportedProxyFeatures{}} cases[v] = testcase{expect: supportedProxyFeatures{}}
} }

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

@ -7,8 +7,8 @@ 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.0", "1.22.1",
"1.21.1", "1.21.3",
"1.20.2", "1.20.4",
"1.19.3", "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.0"} ENVOY_VERSION=${ENVOY_VERSION:-"1.22.1"}
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.0, 1.21.1, 1.20.2, 1.19.3 | | 1.12.x | 1.22.1, 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> |