From def0a72bb92d6c4c487077838380a1f9582a1808 Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Fri, 12 Aug 2022 07:40:05 +0000 Subject: [PATCH 1/4] backport of commit ed43ee2330a1f9c0b5d88b08296c06b9b675f29c --- website/content/docs/connect/cluster-peering/k8s.mdx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/website/content/docs/connect/cluster-peering/k8s.mdx b/website/content/docs/connect/cluster-peering/k8s.mdx index 4986a61b134..15d6daf15b7 100644 --- a/website/content/docs/connect/cluster-peering/k8s.mdx +++ b/website/content/docs/connect/cluster-peering/k8s.mdx @@ -23,8 +23,7 @@ The following CRDs are used to create and manage a peering connection: You must implement the following requirements to create and use cluster peering connections with Kubernetes: - Consul version 1.13.1 or later - At least two Kubernetes clusters -- The Kubernetes clusters must be running in a flat network -- The network must be running on Consul on Kubernetes version 0.47.0 or later +- The installation must be running on Consul on Kubernetes version 0.47.1 or later ### Helm chart configuration @@ -48,7 +47,12 @@ To establish cluster peering through Kubernetes, deploy clusters with the follow -Install Consul on Kubernetes on each Kubernetes cluster by applying `values.yaml` using the Helm CLI. +Install Consul on Kubernetes on each Kubernetes cluster by applying `values.yaml` using the Helm CLI. With these values, +the servers in each cluster will be exposed over a Kubernetes Load balancer service. This service can be customized +using [server.exposeService](/docs/k8s/helm#v-server-exposeservice). When generating a peering token from one of the +clusters, the address(es) of the load balancer will be used in the peering token, so the peering stream will go through +the load balancer in front of the servers. For customizing the addresses used in the peering token, see +[global.peering.tokenGeneration](/docs/k8s/helm#v-global-peering-tokengeneration). ```shell-session $ export HELM_RELEASE_NAME=cluster-name From abca374b6f57f656a15e20db6348a7b3e2df678d Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Fri, 12 Aug 2022 17:54:04 +0000 Subject: [PATCH 2/4] backport of commit 5a849610427c8c706c5b5fa9a2709409aef00e08 --- website/content/docs/connect/cluster-peering/k8s.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/connect/cluster-peering/k8s.mdx b/website/content/docs/connect/cluster-peering/k8s.mdx index 15d6daf15b7..fe48909f7cf 100644 --- a/website/content/docs/connect/cluster-peering/k8s.mdx +++ b/website/content/docs/connect/cluster-peering/k8s.mdx @@ -59,7 +59,7 @@ $ export HELM_RELEASE_NAME=cluster-name ``` ```shell-session -$ helm install ${HELM_RELEASE_NAME} hashicorp/consul --version "0.47.0" --values values.yaml +$ helm install ${HELM_RELEASE_NAME} hashicorp/consul --version "0.47.1" --values values.yaml ``` ## Create a peering token From 12a22800d2e72b137be4458c9fc088398f88d26f Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Fri, 12 Aug 2022 18:04:07 +0000 Subject: [PATCH 3/4] backport of commit 882d6b2ab52afb466408d197df79e72d08a21014 --- website/content/docs/k8s/helm.mdx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/content/docs/k8s/helm.mdx b/website/content/docs/k8s/helm.mdx index 0576bdb8c9d..837a03f562d 100644 --- a/website/content/docs/k8s/helm.mdx +++ b/website/content/docs/k8s/helm.mdx @@ -73,7 +73,9 @@ Use these links to navigate to a particular top-level stanza. - `source` ((#v-global-peering-tokengeneration-serveraddresses-source)) (`string: ""`) - Source can be set to "","consul" or "static". "" is the default source. If servers are enabled, it will check if `server.exposeService` is enabled, and read - the addresses from that service to use as the peering token server addresses. + the addresses from that service to use as the peering token server addresses. If using admin partitions and + only Consul client agents are enabled, the addresses in `externalServers.hosts` and `externalServers.grpcPort` + will be used. "consul" will use the Consul advertise addresses in the peering token. From 17ab8a8874bab8b9978745ef5c476e9139dca4b5 Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Fri, 12 Aug 2022 18:10:44 +0000 Subject: [PATCH 4/4] backport of commit 46c4992ee4b3f335392faa1654705fe9f1d53f70 --- website/content/docs/connect/cluster-peering/k8s.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/docs/connect/cluster-peering/k8s.mdx b/website/content/docs/connect/cluster-peering/k8s.mdx index fe48909f7cf..7471efed86f 100644 --- a/website/content/docs/connect/cluster-peering/k8s.mdx +++ b/website/content/docs/connect/cluster-peering/k8s.mdx @@ -49,10 +49,10 @@ To establish cluster peering through Kubernetes, deploy clusters with the follow Install Consul on Kubernetes on each Kubernetes cluster by applying `values.yaml` using the Helm CLI. With these values, the servers in each cluster will be exposed over a Kubernetes Load balancer service. This service can be customized -using [server.exposeService](/docs/k8s/helm#v-server-exposeservice). When generating a peering token from one of the +using [`server.exposeService`](/docs/k8s/helm#v-server-exposeservice). When generating a peering token from one of the clusters, the address(es) of the load balancer will be used in the peering token, so the peering stream will go through the load balancer in front of the servers. For customizing the addresses used in the peering token, see -[global.peering.tokenGeneration](/docs/k8s/helm#v-global-peering-tokengeneration). +[`global.peering.tokenGeneration`](/docs/k8s/helm#v-global-peering-tokengeneration). ```shell-session $ export HELM_RELEASE_NAME=cluster-name