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: Upgrade Envoy 1.20 to 1.20.1 #11895

Merged
merged 3 commits into from
Jan 18, 2022
Merged

connect: Upgrade Envoy 1.20 to 1.20.1 #11895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0df9ba
connect: Upgrade Envoy 1.20 to 1.20.1
eculver Dec 20, 2021
efd105b
add changelog entry
eculver Dec 20, 2021
1b210d8
Update agent/xds/envoy_versioning_test.go
Jan 18, 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
3 changes: 3 additions & 0 deletions .changelog/11895.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
connect: update Envoy supported version of 1.20 to 1.20.1
```
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,10 +837,10 @@ jobs:
environment:
ENVOY_VERSION: "1.19.1"

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

# run integration tests for the connect ca providers
test-connect-ca-providers:
Expand Down Expand Up @@ -1091,7 +1091,7 @@ workflows:
- envoy-integration-test-1_19_1:
requires:
- dev-build
- envoy-integration-test-1_20_0:
- envoy-integration-test-1_20_1:
requires:
- dev-build

Expand Down
2 changes: 1 addition & 1 deletion agent/xds/envoy_versioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,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",
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we be replacing or appending?

Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like we should probably append?

"1.20.0", "1.20.1",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}
Expand Down
2 changes: 1 addition & 1 deletion agent/xds/proxysupport/proxysupport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package proxysupport
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.20.0",
"1.20.1",
"1.19.1",
"1.18.4",
"1.17.4",
Expand Down
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.20.0"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.20.1"}
export ENVOY_VERSION

if [ ! -z "$DEBUG" ] ; then
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 @@ -35,7 +35,7 @@ compatible Envoy versions.

| Consul Version | Compatible Envoy Versions |
| ------------------- | ------------------------------------------------------ |
| 1.11.x | 1.20.0, 1.19.1, 1.18.4, 1.17.4 |
| 1.11.x | 1.20.1, 1.19.1, 1.18.4, 1.17.4 |
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we still claim compatibility with Envoy 1.20.0 for Consul 1.11.x or did we drop 1.20.0 support between 1.10.x and 1.11.x?

Copy link
Contributor

Choose a reason for hiding this comment

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

We usually only point to the latest Envoy release since older versions contain CVEs and have vulnerabilities

| 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