From c5b3f98b14ee2952ddf1823c1481f145935cb714 Mon Sep 17 00:00:00 2001 From: Rebecca Zanzig Date: Thu, 7 Mar 2019 16:52:50 -0800 Subject: [PATCH] Move aclSyncToken docs under `syncCatalog` Additionally updates the anchors to follow the established convention. --- website/source/docs/platform/k8s/helm.html.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/website/source/docs/platform/k8s/helm.html.md b/website/source/docs/platform/k8s/helm.html.md index 24a638bb1..544defd4e 100644 --- a/website/source/docs/platform/k8s/helm.html.md +++ b/website/source/docs/platform/k8s/helm.html.md @@ -166,12 +166,6 @@ and consider if they're appropriate for your deployment. topologyKey: kubernetes.io/hostname ``` - * `aclSyncToken` - references a Kubernetes [secret](https://kubernetes.io/docs/concepts/configuration/secret/#creating-your-own-secrets) that contains an existing Consul ACL token. This will provide the sync process the correct permissions. This is only needed if ACLs are enabled on the Consul cluster. - - - secretName `(string: null)` - The name of the Kubernetes secret. This defaults to null. - - - secretKey `(string: null)` - The key for the Kubernetes secret. This defaults to null. - * `client` - Values that configure running a Consul client on Kubernetes nodes. * `enabled` (`boolean: global.enabled`) - If true, the chart will install all the resources necessary for a Consul client on every Kubernetes node. This _does not_ require `server.enabled`, since the agents can be configured to join an external cluster. @@ -242,6 +236,12 @@ to run the sync program. * `nodePortSyncType` (`string: ExternalFirst`) - Configures the type of syncing that happens for NodePort services. The only valid options are: `ExternalOnly`, `InternalOnly`, and `ExternalFirst`. `ExternalOnly` will only use a node's ExternalIP address for the sync, otherwise the service will not be synced. `InternalOnly` uses the node's InternalIP address. `ExternalFirst` will preferentially use the node's ExternalIP address, but if it doesn't exist, it will use the node's InternalIP address instead. + * `aclSyncToken` - references a Kubernetes [secret](https://kubernetes.io/docs/concepts/configuration/secret/#creating-your-own-secrets) that contains an existing Consul ACL token. This will provide the sync process the correct permissions. This is only needed if ACLs are enabled on the Consul cluster. + + - secretName `(string: null)` - The name of the Kubernetes secret. This defaults to null. + + - secretKey `(string: null)` - The key for the Kubernetes secret. This defaults to null. + * `ui` - Values that configure the Consul UI. * `enabled` (`boolean: global.enabled`) - If true, the UI will be enabled. This will only _enable_ the UI, it doesn't automatically register any service for external access. The UI will only be enabled on server agents. If `server.enabled` is false, then this setting has no effect. To expose the UI in some way, you must configure `ui.service`.