From 963f609b6d50be9108271bca090341bd1e4f51ea Mon Sep 17 00:00:00 2001
From: Chris Thain <32781396+cthain@users.noreply.github.com>
Date: Thu, 19 Oct 2023 14:45:33 -0700
Subject: [PATCH] release/1.16.x - Update supported Envoy versions (#19273)

---
 .changelog/19273.txt                               | 3 +++
 .github/workflows/test-integrations.yml            | 4 ++--
 envoyextensions/xdscommon/envoy_versioning_test.go | 6 +++---
 envoyextensions/xdscommon/proxysupport.go          | 6 +++---
 website/content/docs/connect/proxies/envoy.mdx     | 6 +++---
 5 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 .changelog/19273.txt

diff --git a/.changelog/19273.txt b/.changelog/19273.txt
new file mode 100644
index 000000000..b5264e101
--- /dev/null
+++ b/.changelog/19273.txt
@@ -0,0 +1,3 @@
+```release-note:security
+connect: update supported envoy versions to 1.24.12, 1.25.11, 1.26.6 to address [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76)
+```
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
index a6159ccca..3ffc42e1b 100644
--- a/.github/workflows/test-integrations.yml
+++ b/.github/workflows/test-integrations.yml
@@ -260,7 +260,7 @@ jobs:
           # this is further going to multiplied in envoy-integration tests by the 
           # other dimensions in the matrix.  Currently TOTAL_RUNNERS would be
           # multiplied by 8 based on these values:
-          # envoy-version: ["1.23.12", "1.24.10", "1.25.9", "1.26.4"]
+          # envoy-version: ["1.23.12", "1.24.12", "1.25.11", "1.26.6"]
           # xds-target: ["server", "client"]
           TOTAL_RUNNERS: 4 
           JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@@ -294,7 +294,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        envoy-version: ["1.26.4"]
+        envoy-version: ["1.26.6"]
         xds-target: ["server", "client"]
         test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
     env:
diff --git a/envoyextensions/xdscommon/envoy_versioning_test.go b/envoyextensions/xdscommon/envoy_versioning_test.go
index 74d26aac1..a86105e84 100644
--- a/envoyextensions/xdscommon/envoy_versioning_test.go
+++ b/envoyextensions/xdscommon/envoy_versioning_test.go
@@ -152,9 +152,9 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 	*/
 	for _, v := range []string{
 		"1.23.0", "1.23.1", "1.23.2", "1.23.3", "1.23.4", "1.23.5", "1.23.6", "1.23.7", "1.23.8", "1.23.9", "1.23.10", "1.23.11", "1.23.12",
-		"1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", "1.24.7", "1.24.8", "1.24.9", "1.24.10",
-		"1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", "1.25.5", "1.25.6", "1.25.7", "1.25.8", "1.25.9",
-		"1.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4",
+		"1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", "1.24.7", "1.24.8", "1.24.9", "1.24.10", "1.24.11", "1.24.12",
+		"1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", "1.25.5", "1.25.6", "1.25.7", "1.25.8", "1.25.9", "1.25.10", "1.25.11",
+		"1.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4", "1.26.5", "1.26.6",
 	} {
 		cases[v] = testcase{expect: SupportedProxyFeatures{}}
 	}
diff --git a/envoyextensions/xdscommon/proxysupport.go b/envoyextensions/xdscommon/proxysupport.go
index 664540557..e2295cf98 100644
--- a/envoyextensions/xdscommon/proxysupport.go
+++ b/envoyextensions/xdscommon/proxysupport.go
@@ -12,9 +12,9 @@ import "strings"
 //
 // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
 var EnvoyVersions = []string{
-	"1.26.4",
-	"1.25.9",
-	"1.24.10",
+	"1.26.6",
+	"1.25.11",
+	"1.24.12",
 	"1.23.12",
 }
 
diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
index f82a996d3..f01a9f9c4 100644
--- a/website/content/docs/connect/proxies/envoy.mdx
+++ b/website/content/docs/connect/proxies/envoy.mdx
@@ -39,9 +39,9 @@ Consul supports **four major Envoy releases** at the beginning of each major Con
 
 | Consul Version      | Compatible Envoy Versions                                                          |
 | ------------------- | -----------------------------------------------------------------------------------|
-| 1.16.x              | 1.26.4, 1.25.9, 1.24.10, 1.23.12                                                   |
-| 1.15.x              | 1.25.9, 1.24.10, 1.23.12, 1.22.11                                                  |
-| 1.14.x              | 1.24.10, 1.23.12, 1.22.11, 1.21.6                                                  |
+| 1.16.x              | 1.26.6, 1.25.11, 1.24.12, 1.23.12                                                  |
+| 1.15.x              | 1.25.11, 1.24.12, 1.23.12, 1.22.11                                                 |
+| 1.14.x              | 1.24.12, 1.23.12, 1.22.11, 1.21.6                                                  |
 
 ### Envoy and Consul Dataplane