diff --git a/.changelog/13807.txt b/.changelog/13807.txt new file mode 100644 index 000000000..d1cec75f7 --- /dev/null +++ b/.changelog/13807.txt @@ -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 +``` diff --git a/.circleci/config.yml b/.circleci/config.yml index a9c434b46..de9620486 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,9 +24,10 @@ references: VAULT_BINARY_VERSION: 1.9.4 GO_VERSION: 1.18.1 envoy-versions: &supported_envoy_versions - - &default_envoy_version "1.19.5" - - "1.20.4" - - "1.21.3" + - &default_envoy_version "1.20.6" + - "1.21.4" + - "1.22.2" + - "1.23.0" images: # When updating the Go version, remember to also update the versions in the # workflows section for go-test-lib jobs. diff --git a/agent/xds/envoy_versioning.go b/agent/xds/envoy_versioning.go index e0face0bd..31955e28a 100644 --- a/agent/xds/envoy_versioning.go +++ b/agent/xds/envoy_versioning.go @@ -11,7 +11,7 @@ import ( var ( // minSupportedVersion is the oldest mainline version we support. This should always be // 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{} ) diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index 36c3831b1..4e446de1e 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -120,6 +120,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { "1.16.6": {expectErr: "Envoy 1.16.6 " + errTooOld}, "1.17.4": {expectErr: "Envoy 1.17.4 " + 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. @@ -134,10 +135,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { } */ 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.21.0", "1.21.1", "1.21.2", "1.21.3", + "1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", + "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.22.0", "1.22.1", "1.22.2", + "1.23.0", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index 22ddd15d8..bdb7cc864 100644 --- a/agent/xds/proxysupport/proxysupport.go +++ b/agent/xds/proxysupport/proxysupport.go @@ -7,8 +7,8 @@ package proxysupport // // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions var EnvoyVersions = []string{ + "1.23.0", "1.22.2", - "1.21.3", - "1.20.4", - "1.19.5", + "1.21.4", + "1.20.6", } diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index 21705a3ae..fc885f9a1 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -12,7 +12,7 @@ DEBUG=${DEBUG:-} XDS_TARGET=${XDS_TARGET:-server} # 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 DOCKER_BUILDKIT=1