From b48c42a6cc0e002af4586b3cbe25a1fb0e8b51a0 Mon Sep 17 00:00:00 2001
From: Nathan Coleman <nathan.coleman@hashicorp.com>
Date: Wed, 12 Apr 2023 17:09:27 -0400
Subject: [PATCH] Add newly-released Envoy versions 1.23.8 and 1.24.6

---
 .changelog/16889.txt                               | 2 +-
 .circleci/config.yml                               | 4 ++--
 envoyextensions/xdscommon/envoy_versioning_test.go | 4 ++--
 envoyextensions/xdscommon/proxysupport.go          | 4 ++--
 website/content/docs/connect/proxies/envoy.mdx     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.changelog/16889.txt b/.changelog/16889.txt
index c2e98d91cd..6c0ff707c1 100644
--- a/.changelog/16889.txt
+++ b/.changelog/16889.txt
@@ -1,3 +1,3 @@
 ```release-note:improvement
-connect: update supported envoy versions to 1.22.10, 1.23.7, 1.24.5, 1.25.4
+connect: update supported envoy versions to 1.22.10, 1.23.8, 1.24.6, 1.25.4
 ```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 92c77964da..b318218f6c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,8 +23,8 @@ references:
     GO_VERSION: 1.20.1
   envoy-versions: &supported_envoy_versions
     - &default_envoy_version "1.22.10"
-    - "1.23.7"
-    - "1.24.5"
+    - "1.23.8"
+    - "1.24.6"
     - "1.25.4"
   nomad-versions: &supported_nomad_versions
     - &default_nomad_version "1.3.3"
diff --git a/envoyextensions/xdscommon/envoy_versioning_test.go b/envoyextensions/xdscommon/envoy_versioning_test.go
index ac67b8278b..8319cfd1cf 100644
--- a/envoyextensions/xdscommon/envoy_versioning_test.go
+++ b/envoyextensions/xdscommon/envoy_versioning_test.go
@@ -140,8 +140,8 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 	*/
 	for _, v := range []string{
 		"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.23.0", "1.23.1", "1.23.2", "1.23.3", "1.23.4", "1.23.5", "1.23.6", "1.23.7",
-		"1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5",
+		"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.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6",
 		"1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4",
 	} {
 		cases[v] = testcase{expect: SupportedProxyFeatures{}}
diff --git a/envoyextensions/xdscommon/proxysupport.go b/envoyextensions/xdscommon/proxysupport.go
index 10afc9eca6..bc641c0289 100644
--- a/envoyextensions/xdscommon/proxysupport.go
+++ b/envoyextensions/xdscommon/proxysupport.go
@@ -13,8 +13,8 @@ import "strings"
 // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
 var EnvoyVersions = []string{
 	"1.25.4",
-	"1.24.5",
-	"1.23.7",
+	"1.24.6",
+	"1.23.8",
 	"1.22.10",
 }
 
diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
index 5f627ce59a..f655d87c33 100644
--- 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.15.x              | 1.25.4, 1.24.5, 1.23.7, 1.22.10                                                     |
+| 1.15.x              | 1.25.4, 1.24.6, 1.23.8, 1.22.10                                                     |
 | 1.14.x              | 1.24.0, 1.23.1, 1.22.5, 1.21.5                                                     |
 | 1.13.x              | 1.23.1, 1.22.5, 1.21.5, 1.20.7                                                     |