diff --git a/.changelog/13431.txt b/.changelog/13431.txt
new file mode 100644
index 0000000000..57704134a0
--- /dev/null
+++ b/.changelog/13431.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: Update Envoy support matrix to latest patch releases (1.22.2, 1.21.3, 1.20.4, 1.19.5)
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7edc711e5f..8f16c6ce52 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -852,13 +852,13 @@ jobs:
path: *TEST_RESULTS_DIR
- run: *notify-slack-failure
- envoy-integration-test-1_19_3: &ENVOY_TESTS
+ envoy-integration-test-1_19_5: &ENVOY_TESTS
machine:
image: *UBUNTU_CI_IMAGE
parallelism: 4
resource_class: medium
environment:
- ENVOY_VERSION: "1.19.3"
+ ENVOY_VERSION: "1.19.5"
steps: &ENVOY_INTEGRATION_TEST_STEPS
- checkout
# Get go binary from workspace
@@ -891,20 +891,20 @@ jobs:
path: *TEST_RESULTS_DIR
- run: *notify-slack-failure
- 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"
- envoy-integration-test-1_21_1:
+ envoy-integration-test-1_21_3:
<<: *ENVOY_TESTS
environment:
- ENVOY_VERSION: "1.21.1"
+ ENVOY_VERSION: "1.21.3"
- envoy-integration-test-1_22_0:
+ envoy-integration-test-1_22_1:
<<: *ENVOY_TESTS
environment:
- ENVOY_VERSION: "1.22.0"
+ ENVOY_VERSION: "1.22.1"
# run integration tests for the connect ca providers
test-connect-ca-providers:
@@ -1131,16 +1131,16 @@ workflows:
- nomad-integration-0_8:
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
- - envoy-integration-test-1_21_1:
+ - envoy-integration-test-1_21_3:
requires:
- dev-build
- - envoy-integration-test-1_22_0:
+ - envoy-integration-test-1_22_1:
requires:
- dev-build
- compatibility-integration-test:
diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go
index 8f93c90dda..686208ad10 100644
--- a/agent/xds/envoy_versioning_test.go
+++ b/agent/xds/envoy_versioning_test.go
@@ -134,10 +134,10 @@ 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.21.1",
- "1.22.0",
+ "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",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}
diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go
index eb693e6328..ca5ba81255 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.22.0",
- "1.21.1",
- "1.20.2",
- "1.19.3",
+ "1.22.1",
+ "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 5f83e804de..62a73e1eab 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.0"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.22.1"}
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 d6bab52535..d2b27fb27e 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.0, 1.21.1, 1.20.2, 1.19.3 |
+| 1.12.x | 1.22.1, 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 |