release/1.14.x - Update supported Envoy versions (#19271)

hashicorp · Oct 19, 2023 · ef17aab · ef17aab
1 parent 0898aa1
commit ef17aab
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.changelog/19271.txt b/.changelog/19271.txt
@@ -0,0 +1,3 @@
+```release-note:security
+connect: update supported envoy versions to 1.24.12 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
@@ -243,7 +243,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.21.6", "1.22.11", "1.23.12", "1.24.10"]
+          # envoy-version: ["1.21.6", "1.22.11", "1.23.12", "1.24.12"]
           # xds-target: ["server", "client"]
           TOTAL_RUNNERS: 4 
           JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@@ -277,7 +277,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        envoy-version: ["1.21.6", "1.22.11", "1.23.12", "1.24.10"]
+        envoy-version: ["1.21.6", "1.22.11", "1.23.12", "1.24.12"]
         xds-target: ["server", "client"]
         test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
     env:

diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go
@@ -139,7 +139,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 		"1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6",
 		"1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5", "1.22.6", "1.22.7", "1.22.8", "1.22.9", "1.22.10", "1.22.11",
 		"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.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",
 	} {
 		cases[v] = testcase{expect: supportedProxyFeatures{}}
 	}

diff --git 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.24.10",
+	"1.24.12",
 	"1.23.12",
 	"1.22.11",
 	"1.21.6",

diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
@@ -39,7 +39,7 @@ Consul supports **four major Envoy releases** at the beginning of each major Con
 
 | Consul Version      | Compatible Envoy Versions                                                          |
 | ------------------- | -----------------------------------------------------------------------------------|
-| 1.14.x              | 1.24.10, 1.23.12, 1.22.11, 1.21.6                                                  |
+| 1.14.x              | 1.24.12, 1.23.12, 1.22.11, 1.21.6                                                  |
 | 1.13.x              | 1.23.1, 1.22.5, 1.21.5, 1.20.7                                                     |
 | 1.12.x              | 1.22.5, 1.21.5, 1.20.7, 1.19.5                                                     |