luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #4948 from hashicorp/docs/helm-auto-join

Browse source 
Update the helm chart `join` instructions
This commit is contained in:
Rebecca Zanzig 2018-11-12 12:58:43 -08:00 committed by GitHub
parent bc5333905a b04e96f889
commit f9abffb340
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
website/source/docs/platform/k8s/helm.html.md
View file

@ -246,8 +246,8 @@ and consider if they're appropriate for your deployment.
to false. to false.
- <a name="v-client-join" href="#v-client-join">`join`</a> (`array<string>: null`) - - <a name="v-client-join" href="#v-client-join">`join`</a> (`array<string>: null`) -
A list of values to be used with the `-retry-join` command, specified A list of valid [`-retry-join` values](/docs/agent/options.html#retry-join).
individually in the format "option=value". If this is `null` (default), If this is `null` (default),
then the clients will attempt to automatically join the server cluster then the clients will attempt to automatically join the server cluster
running within Kubernetes. This means that with `server.enabled` set to true, running within Kubernetes. This means that with `server.enabled` set to true,
clients will automatically join that cluster. If `server.enabled` is not clients will automatically join that cluster. If `server.enabled` is not

4
website/source/docs/platform/k8s/run.html.md
View file

@ -94,9 +94,7 @@ global:
client: client:
enabled: true enabled: true
join: join:
- "provider=my-cloud" - "provider=my-cloud config=val ..."
- "config=val"
- "..."
``` ```
The `values.yaml` file to configure the Helm chart sets the proper The `values.yaml` file to configure the Helm chart sets the proper