From e25e26a39e045390e47f735bc1fc1137fd74bfad Mon Sep 17 00:00:00 2001
From: Michael Zalimeni <michael.zalimeni@hashicorp.com>
Date: Thu, 27 Jul 2023 11:43:30 -0400
Subject: [PATCH] [NET-4904] Update list of Envoy versions on 1.14.x (#18305)

Update list of Envoy versions

Update supported envoy versions to 1.21.6, 1.22.11, 1.23.12, 1.24.10.
---
 .changelog/18305.txt                    | 3 +++
 .github/workflows/test-integrations.yml | 4 ++--
 agent/xds/envoy_versioning_test.go      | 4 ++--
 agent/xds/proxysupport/proxysupport.go  | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 .changelog/18305.txt

diff --git a/.changelog/18305.txt b/.changelog/18305.txt
new file mode 100644
index 0000000000..3cb293dc8a
--- /dev/null
+++ b/.changelog/18305.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update supported envoy versions to 1.21.6, 1.22.11, 1.23.12, 1.24.10
+```
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
index b56e78e0e7..78884e8d30 100644
--- a/.github/workflows/test-integrations.yml
+++ b/.github/workflows/test-integrations.yml
@@ -239,7 +239,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.9", "1.24.7"]
+          # envoy-version: ["1.21.6", "1.22.11", "1.23.12", "1.24.10"]
           # xds-target: ["server", "client"]
           TOTAL_RUNNERS: 4 
           JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@@ -273,7 +273,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        envoy-version: ["1.21.6", "1.22.11", "1.23.9", "1.24.7"]
+        envoy-version: ["1.21.6", "1.22.11", "1.23.12", "1.24.10"]
         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
index 299b4b1116..c9da691ae5 100644
--- a/agent/xds/envoy_versioning_test.go
+++ b/agent/xds/envoy_versioning_test.go
@@ -138,8 +138,8 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 	for _, v := range []string{
 		"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.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", "1.24.7",
+		"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",
 	} {
 		cases[v] = testcase{expect: supportedProxyFeatures{}}
 	}
diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go
index b81ab8a574..742c6343e8 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.24.8",
-	"1.23.10",
+	"1.24.10",
+	"1.23.12",
 	"1.22.11",
 	"1.21.6",
 }