diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f16c6ce5..c22d04fb8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -901,10 +901,10 @@ jobs: environment: ENVOY_VERSION: "1.21.3" - envoy-integration-test-1_22_1: + envoy-integration-test-1_22_2: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.22.1" + ENVOY_VERSION: "1.22.2" # run integration tests for the connect ca providers test-connect-ca-providers: @@ -1140,7 +1140,7 @@ workflows: - envoy-integration-test-1_21_3: requires: - dev-build - - envoy-integration-test-1_22_1: + - envoy-integration-test-1_22_2: requires: - dev-build - compatibility-integration-test: diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index 686208ad1..36c3831b1 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -135,9 +135,9 @@ 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.3", - "1.21.1", "1.21.2", "1.21.3", - "1.22.0", "1.22.1", + "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.22.0", "1.22.1", "1.22.2", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index ca5ba8125..22ddd15d8 100644 --- a/agent/xds/proxysupport/proxysupport.go +++ b/agent/xds/proxysupport/proxysupport.go @@ -7,7 +7,7 @@ package proxysupport // // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions var EnvoyVersions = []string{ - "1.22.1", + "1.22.2", "1.21.3", "1.20.4", "1.19.5", diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index 62a73e1ea..db09e0c07 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -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.1"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.22.2"} export ENVOY_VERSION export DOCKER_BUILDKIT=1 diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx index d2b27fb27..ee0b1b165 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -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.1, 1.21.3, 1.20.4, 1.19.5 | +| 1.12.x | 1.22.2, 1.21.3, 1.20.4, 1.19.5 | | 1.11.x | 1.20.2, 1.19.3, 1.18.6, 1.17.41 | | 1.10.x | 1.18.6, 1.17.41, 1.16.51 , 1.15.51 |