Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of [NET-4122] Doc guidance for federation with externalServers into release/1.2.x #2606

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions charts/consul/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,9 @@ global:
# If enabled, this datacenter will be federation-capable. Only federation
# via mesh gateways is supported.
# Mesh gateways and servers will be configured to allow federation.
# Requires `global.tls.enabled`, `meshGateway.enabled` and `connectInject.enabled`
# to be true. Requires Consul 1.8+.
# Requires `global.tls.enabled`, `connectInject.enabled`, and one of
# `meshGateway.enabled` or `externalServers.enabled` to be true.
# Requires Consul 1.8+.
enabled: false

# If true, the chart will create a Kubernetes secret that can be imported
Expand All @@ -552,8 +553,8 @@ global:
# @type: string
primaryDatacenter: null

# A list of addresses of the primary mesh gateways in the form `<ip>:<port>`.
# (e.g. ["1.1.1.1:443", "2.3.4.5:443"]
# A list of addresses of the primary mesh gateways in the form `<ip>:<port>`
# (e.g. `["1.1.1.1:443", "2.3.4.5:443"]`).
# @type: array<string>
primaryGateways: []

Expand All @@ -564,6 +565,9 @@ global:
# from the one used by the Consul Service Mesh.
# Please refer to the [Kubernetes Auth Method documentation](https://developer.hashicorp.com/consul/docs/security/acl/auth-methods/kubernetes).
#
# If `externalServers.enabled` is set to true, `global.federation.k8sAuthMethodHost` and
# `externalServers.k8sAuthMethodHost` should be set to the same value.
#
# You can retrieve this value from your `kubeconfig` by running:
#
# ```shell-session
Expand Down Expand Up @@ -1339,6 +1343,9 @@ externalServers:
# This address must be reachable from the Consul servers.
# Please refer to the [Kubernetes Auth Method documentation](https://developer.hashicorp.com/consul/docs/security/acl/auth-methods/kubernetes).
#
# If `global.federation.enabled` is set to true, `global.federation.k8sAuthMethodHost` and
# `externalServers.k8sAuthMethodHost` should be set to the same value.
#
# You could retrieve this value from your `kubeconfig` by running:
#
# ```shell-session
Expand Down