From fe53c9073330e11818bf87abf7763a32f30fff0a Mon Sep 17 00:00:00 2001
From: David Yu <dyu@hashicorp.com>
Date: Tue, 20 Feb 2024 17:09:20 +0000
Subject: [PATCH 1/2] backport of commit
 1598b408e301649d6be3a9c351b426f6e4608b96

---
 charts/consul/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml
index 4b7e6a56bf..f77885ef33 100644
--- a/charts/consul/values.yaml
+++ b/charts/consul/values.yaml
@@ -1328,7 +1328,7 @@ externalServers:
   # Note: If enabling clients, `client.join` must also be set to the hosts that should be
   # used to join the cluster. In most cases, the `client.join` values
   # should be the same, however, they may be different if you
-  # wish to use separate hosts for the HTTPS connections.
+  # wish to use separate hosts for the HTTPS connections. `tlsServerName` is required if TLS is enabled and 'hosts' is not a DNS name.
   # @type: array<string>
   hosts: []
 
@@ -1338,7 +1338,7 @@ externalServers:
   # The GRPC port of the Consul servers.
   grpcPort: 8502
 
-  # The server name to use as the SNI host header when connecting with HTTPS.
+  # The server name to use as the SNI host header when connecting with HTTPS. This is also the hostname to expect in the server certificate's subject.
   # @type: string
   tlsServerName: null
 

From 73609651c93a3a9785bf4bf023fbc9d6b331bcd8 Mon Sep 17 00:00:00 2001
From: David Yu <dyu@hashicorp.com>
Date: Tue, 20 Feb 2024 21:55:19 +0000
Subject: [PATCH 2/2] backport of commit
 41dabc413ffd59b8edc1e7205d749a45451e81c3

---
 charts/consul/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml
index f77885ef33..0c6e4aa7f3 100644
--- a/charts/consul/values.yaml
+++ b/charts/consul/values.yaml
@@ -1338,7 +1338,7 @@ externalServers:
   # The GRPC port of the Consul servers.
   grpcPort: 8502
 
-  # The server name to use as the SNI host header when connecting with HTTPS. This is also the hostname to expect in the server certificate's subject.
+  # The server name to use as the SNI host header when connecting with HTTPS. This name also appears as the hostname in the server certificate's subject field.
   # @type: string
   tlsServerName: null