Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jun 14, 2022
+25 −22
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca005e7
connect: Update supported Envoy versions to latest patches
eculver Jun 11, 2022
0d27aba
Fix circle config
eculver Jun 11, 2022
9c58989
Add changelog entry
eculver Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,13 +852,13 @@ jobs:
path: *TEST_RESULTS_DIR
- run: *notify-slack-failure

envoy-integration-test-1_19_3: &ENVOY_TESTS
envoy-integration-test-1_19_5: &ENVOY_TESTS
machine:
image: *UBUNTU_CI_IMAGE
parallelism: 4
resource_class: medium
environment:
ENVOY_VERSION: "1.19.3"
ENVOY_VERSION: "1.19.5"
steps: &ENVOY_INTEGRATION_TEST_STEPS
- checkout
# Get go binary from workspace
Expand Down Expand Up @@ -891,20 +891,20 @@ jobs:
path: *TEST_RESULTS_DIR
- run: *notify-slack-failure

envoy-integration-test-1_20_2:
envoy-integration-test-1_20_4:
<<: *ENVOY_TESTS
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
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
environment:
ENVOY_VERSION: "1.22.0"
ENVOY_VERSION: "1.22.1"

# run integration tests for the connect ca providers
test-connect-ca-providers:
Expand Down Expand Up @@ -1131,16 +1131,16 @@ workflows:
- nomad-integration-0_8:
requires:
- dev-build
- envoy-integration-test-1_19_3:
- envoy-integration-test-1_19_5:
requires:
- dev-build
- envoy-integration-test-1_20_2:
- envoy-integration-test-1_20_4:
requires:
- dev-build
- envoy-integration-test-1_21_1:
- envoy-integration-test-1_21_3:
requires:
- dev-build
- envoy-integration-test-1_22_0:
- envoy-integration-test-1_22_1:
requires:
- dev-build
- compatibility-integration-test:
Expand Down
8 changes: 4 additions & 4 deletions agent/xds/envoy_versioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
}
*/
for _, v := range []string{
"1.19.0", "1.19.1", "1.19.2", "1.19.3",
"1.20.0", "1.20.1", "1.20.2",
"1.21.1",
"1.22.0",
"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.21.1", "1.21.2", "1.21.3",
"1.22.0", "1.22.1",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}
Expand Down
8 changes: 4 additions & 4 deletions agent/xds/proxysupport/proxysupport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package proxysupport
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.22.0",
"1.21.1",
"1.20.2",
"1.19.3",
"1.22.1",
"1.21.3",
"1.20.4",
"1.19.5",
}
2 changes: 1 addition & 1 deletion test/integration/connect/envoy/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
DEBUG=${DEBUG:-}

# 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 DOCKER_BUILDKIT=1
Expand Down
2 changes: 1 addition & 1 deletion website/content/docs/connect/proxies/envoy.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Consul supports **four major Envoy releases** at the beginning of each major Con

| 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> |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did we also run 1.11.x tests on Envoy 1.20.4 and 1.19.5 as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, good call. I usually only consider these upgrade PRs for the latest release series, but this is different since it's patches. I will create a separate PR for 1.11.x.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For posterity, this is the PR for 1.11: #13434

| 1.10.x | 1.18.6, 1.17.4<sup>1</sup>, 1.16.5<sup>1</sup> , 1.15.5<sup>1</sup> |

Expand Down