From 8ca4e56db1be6af32cec47840bf6ce66ab2a1a1c Mon Sep 17 00:00:00 2001 From: Rebecca Zanzig Date: Mon, 12 Nov 2018 12:22:18 -0800 Subject: [PATCH] Update the helm chart `join` instructions This fixes some previous incorrect information about the join feature in the Helm chart. Based on the fix for consul-helm issue 59. --- website/source/docs/platform/k8s/helm.html.md | 4 ++-- website/source/docs/platform/k8s/run.html.md | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/website/source/docs/platform/k8s/helm.html.md b/website/source/docs/platform/k8s/helm.html.md index cbb11ffd8d..a232f13623 100644 --- a/website/source/docs/platform/k8s/helm.html.md +++ b/website/source/docs/platform/k8s/helm.html.md @@ -246,8 +246,8 @@ and consider if they're appropriate for your deployment. to false. - `join` (`array: null`) - - A list of values to be used with the `-retry-join` command, specified - individually in the format "option=value". If this is `null` (default), + A list of valid [`-retry-join` values](/docs/agent/options.html#retry-join). + If this is `null` (default), then the clients will attempt to automatically join the server cluster running within Kubernetes. This means that with `server.enabled` set to true, clients will automatically join that cluster. If `server.enabled` is not diff --git a/website/source/docs/platform/k8s/run.html.md b/website/source/docs/platform/k8s/run.html.md index f644e8424a..a5bc1c5fca 100644 --- a/website/source/docs/platform/k8s/run.html.md +++ b/website/source/docs/platform/k8s/run.html.md @@ -94,9 +94,7 @@ global: client: enabled: true join: - - "provider=my-cloud" - - "config=val" - - "..." + - "provider=my-cloud config=val ..." ``` The `values.yaml` file to configure the Helm chart sets the proper