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

connect: Add support for Envoy 1.23, remove 1.19 (#13807)

This commit is contained in:
Evan Culver 2022-07-19 14:51:04 -07:00 committed by GitHub
parent a9f17c0f99
commit 285b4cef2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changelog/13807.txt Normal file
View File

@ -0,0 +1,6 @@
```release-note: improvement
connect: Add Envoy 1.23.0 to support matrix
```
```release-note: breaking-change
connect: Removes support for Envoy 1.19
```

7
.circleci/config.yml
View File

@ -24,9 +24,10 @@ references:
VAULT_BINARY_VERSION: 1.9.4 VAULT_BINARY_VERSION: 1.9.4
GO_VERSION: 1.18.1 GO_VERSION: 1.18.1
envoy-versions: &supported_envoy_versions envoy-versions: &supported_envoy_versions
- &default_envoy_version "1.19.5" - &default_envoy_version "1.20.6"
- "1.20.4" - "1.21.4"
- "1.21.3" - "1.22.2"
- "1.23.0"
images: images:
# When updating the Go version, remember to also update the versions in the # When updating the Go version, remember to also update the versions in the
# workflows section for go-test-lib jobs. # workflows section for go-test-lib jobs.

2
agent/xds/envoy_versioning.go
View File

@ -11,7 +11,7 @@ import (
var ( var (
// minSupportedVersion is the oldest mainline version we support. This should always be // minSupportedVersion is the oldest mainline version we support. This should always be
// the zero'th point release of the last element of proxysupport.EnvoyVersions. // the zero'th point release of the last element of proxysupport.EnvoyVersions.
minSupportedVersion = version.Must(version.NewVersion("1.19.0")) minSupportedVersion = version.Must(version.NewVersion("1.20.0"))
specificUnsupportedVersions = []unsupportedVersion{} specificUnsupportedVersions = []unsupportedVersion{}
) )

7
agent/xds/envoy_versioning_test.go
View File

@ -120,6 +120,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
"1.16.6": {expectErr: "Envoy 1.16.6 " + errTooOld}, "1.16.6": {expectErr: "Envoy 1.16.6 " + errTooOld},
"1.17.4": {expectErr: "Envoy 1.17.4 " + errTooOld}, "1.17.4": {expectErr: "Envoy 1.17.4 " + errTooOld},
"1.18.6": {expectErr: "Envoy 1.18.6 " + errTooOld}, "1.18.6": {expectErr: "Envoy 1.18.6 " + errTooOld},
"1.19.5": {expectErr: "Envoy 1.19.5 " + errTooOld},
} }
// Insert a bunch of valid versions. // Insert a bunch of valid versions.
@ -134,10 +135,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.4", "1.19.5", "1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
"1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4",
"1.21.0", "1.21.1", "1.21.2", "1.21.3",
"1.22.0", "1.22.1", "1.22.2", "1.22.0", "1.22.1", "1.22.2",
"1.23.0",
} { } {
cases[v] = testcase{expect: supportedProxyFeatures{}} cases[v] = testcase{expect: supportedProxyFeatures{}}
} }

6
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.23.0",
"1.22.2", "1.22.2",
"1.21.3", "1.21.4",
"1.20.4", "1.20.6",
"1.19.5",
} }

2
test/integration/connect/envoy/run-tests.sh
View File

@ -12,7 +12,7 @@ DEBUG=${DEBUG:-}
XDS_TARGET=${XDS_TARGET:-server} XDS_TARGET=${XDS_TARGET:-server}
# ENVOY_VERSION to run each test against # ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.22.2"} ENVOY_VERSION=${ENVOY_VERSION:-"1.23.0"}
export ENVOY_VERSION export ENVOY_VERSION
export DOCKER_BUILDKIT=1 export DOCKER_BUILDKIT=1