diff --git a/.changelog/12443.txt b/.changelog/12443.txt
new file mode 100644
index 0000000000..4d3951a25c
--- /dev/null
+++ b/.changelog/12443.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update Envoy supported version of 1.20 to 1.20.2
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 338fa6435c..be9e460122 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -899,10 +899,10 @@ jobs:
environment:
ENVOY_VERSION: "1.19.1"
- envoy-integration-test-1_20_1:
+ envoy-integration-test-1_20_2:
<<: *ENVOY_TESTS
environment:
- ENVOY_VERSION: "1.20.1"
+ ENVOY_VERSION: "1.20.2"
# run integration tests for the connect ca providers
test-connect-ca-providers:
@@ -1154,7 +1154,7 @@ workflows:
- envoy-integration-test-1_19_1:
requires:
- dev-build
- - envoy-integration-test-1_20_1:
+ - envoy-integration-test-1_20_2:
requires:
- dev-build
diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go
index 47622ab737..60ae74d997 100644
--- a/agent/xds/envoy_versioning_test.go
+++ b/agent/xds/envoy_versioning_test.go
@@ -132,7 +132,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
}
for _, v := range []string{
"1.19.0", "1.19.1",
- "1.20.0", "1.20.1",
+ "1.20.0", "1.20.1", "1.20.2",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}
diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go
index 7f7c829a6e..2248ddbfe7 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.20.1",
+ "1.20.2",
"1.19.1",
"1.18.4",
"1.17.4",
diff --git a/test/integration/connect/envoy/helpers.bash b/test/integration/connect/envoy/helpers.bash
index 0c5f606817..f919401496 100755
--- a/test/integration/connect/envoy/helpers.bash
+++ b/test/integration/connect/envoy/helpers.bash
@@ -178,6 +178,13 @@ function assert_envoy_version {
echo "---"
echo "Got version=$VERSION"
echo "Want version=$ENVOY_VERSION"
+
+ # 1.20.2 is a special snowflake in that the version for the release is actually
+ # reported as '1.20.2-dev'
+ if [ "$ENVOY_VERSION" = "1.20.2" ] ; then
+ ENVOY_VERSION="1.20.2-dev"
+ fi
+
echo $VERSION | grep "/$ENVOY_VERSION/"
}
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
index 148ceb4d11..db008d5a5d 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.20.1"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.20.2"}
export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then
diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
index f2eddc6c95..d43e8b1c23 100644
--- a/website/content/docs/connect/proxies/envoy.mdx
+++ b/website/content/docs/connect/proxies/envoy.mdx
@@ -35,7 +35,7 @@ compatible Envoy versions.
| Consul Version | Compatible Envoy Versions |
| ------------------- | ------------------------------------------------------ |
-| 1.11.x | 1.20.1, 1.19.1, 1.18.4, 1.17.4 |
+| 1.11.x | 1.20.2, 1.19.1, 1.18.4, 1.17.4 |
| 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.71, 1.13.71 |
| 1.8.x | 1.14.7, 1.13.7, 1.12.7, 1.11.2 |