From fd15fe6a36bedbbc9567f195cda6d42284d164f9 Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 5 Sep 2023 19:33:02 +0000 Subject: [PATCH 1/3] backport of commit 3d287ad4c6a9221e0e5eeae8439d073d066780e3 --- charts/consul/values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index eb6973f6e2..c413b8840f 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -2928,8 +2928,9 @@ ingressGateways: # Gateways is a list of gateway objects. The only required field for # each is `name`, though they can also contain any of the fields in - # `defaults`. Values defined here override the defaults except in the - # case of annotations where both will be applied. + # `defaults`. Names must be provided for each and they must be + # unique, regardless of whether they are in different namespaces. + # Values defined here override the defaults except in the case of annotations where both will be applied. # @type: array gateways: - name: ingress-gateway From 535f2866b7b3644f8308d26cc4b13177d49385ac Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 5 Sep 2023 19:36:23 +0000 Subject: [PATCH 2/3] backport of commit cda31e249602d62f13dcbdcd20dddbb83ccbfc07 --- 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 c413b8840f..973243646d 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -2928,7 +2928,7 @@ ingressGateways: # Gateways is a list of gateway objects. The only required field for # each is `name`, though they can also contain any of the fields in - # `defaults`. Names must be provided for each and they must be + # `defaults`. Names must be provided for each ingress gateway and they must be # unique, regardless of whether they are in different namespaces. # Values defined here override the defaults except in the case of annotations where both will be applied. # @type: array From 1e59da1fe6f5844581e18dfae3b1eb7213c2ac4b Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 6 Sep 2023 21:07:21 +0000 Subject: [PATCH 3/3] backport of commit 315675e25eb3239481747623ea0ce175da270366 --- charts/consul/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index 973243646d..c0a6fff86f 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -2928,9 +2928,9 @@ ingressGateways: # Gateways is a list of gateway objects. The only required field for # each is `name`, though they can also contain any of the fields in - # `defaults`. Names must be provided for each ingress gateway and they must be - # unique, regardless of whether they are in different namespaces. - # Values defined here override the defaults except in the case of annotations where both will be applied. + # `defaults`. You must provide a unique name for each ingress gateway. These names + # must be unique across different namespaces. + # Values defined here override the defaults, except in the case of annotations where both will be applied. # @type: array gateways: - name: ingress-gateway