diff --git a/.changelog/13434.txt b/.changelog/13434.txt
new file mode 100644
index 00000000000..aa612921351
--- /dev/null
+++ b/.changelog/13434.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: Update supported Envoy versions to 1.20.4, 1.19.5, 1.18.6, 1.17.4
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0312a42b76b..bff61102477 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -847,15 +847,15 @@ jobs:
environment:
ENVOY_VERSION: "1.18.6"
- envoy-integration-test-1_19_3:
+ envoy-integration-test-1_19_5:
<<: *ENVOY_TESTS
environment:
- ENVOY_VERSION: "1.19.3"
+ ENVOY_VERSION: "1.19.5"
- envoy-integration-test-1_20_2:
+ envoy-integration-test-1_20_4:
<<: *ENVOY_TESTS
environment:
- ENVOY_VERSION: "1.20.2"
+ ENVOY_VERSION: "1.20.4"
# run integration tests for the connect ca providers
test-connect-ca-providers:
@@ -1092,10 +1092,10 @@ workflows:
- envoy-integration-test-1_18_6:
requires:
- dev-build
- - envoy-integration-test-1_19_3:
+ - envoy-integration-test-1_19_5:
requires:
- dev-build
- - envoy-integration-test-1_20_2:
+ - envoy-integration-test-1_20_4:
requires:
- dev-build
- noop
diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go
index fa156528597..1889408b86b 100644
--- a/agent/xds/envoy_versioning_test.go
+++ b/agent/xds/envoy_versioning_test.go
@@ -131,8 +131,8 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
}}
}
for _, v := range []string{
- "1.19.0", "1.19.1", "1.19.2", "1.19.3",
- "1.20.0", "1.20.1", "1.20.2",
+ "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",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}
diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go
index aab92fa257e..ffac1bdfae2 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.20.2",
- "1.19.3",
+ "1.20.4",
+ "1.19.5",
"1.18.6",
"1.17.4",
}
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
index 749536fc88a..47dfe70ce75 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.2"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.20.4"}
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 babc8af2766..dce0bb0d30b 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.11.x | 1.20.2, 1.19.3, 1.18.6, 1.17.41 |
+| 1.11.x | 1.20.4, 1.19.5, 1.18.6, 1.17.41 |
| 1.10.x | 1.18.6, 1.17.41, 1.16.51 , 1.15.51 |
| 1.9.x | 1.16.51, 1.15.51, 1.14.71,2, 1.13.71,2 |