From 199a0b0c19be7891d2e23c1f8f6e5532f12f67d2 Mon Sep 17 00:00:00 2001 From: Iryna Shustava Date: Fri, 19 Mar 2021 09:12:49 -0700 Subject: [PATCH] docs: Update Helm reference docs (#9904) --- website/content/docs/k8s/helm.mdx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/content/docs/k8s/helm.mdx b/website/content/docs/k8s/helm.mdx index 32611c938b..2601a17f5d 100644 --- a/website/content/docs/k8s/helm.mdx +++ b/website/content/docs/k8s/helm.mdx @@ -635,7 +635,7 @@ and consider if they're appropriate for your deployment. beta.kubernetes.io/arch: amd64 ``` - - `affinity` ((#v-client-affinity)) (`string: ""`) - Affinity Settings for Client pods, formatted as a multi-line YAML string. + - `affinity` ((#v-client-affinity)) (`string: null`) - Affinity Settings for Client pods, formatted as a multi-line YAML string. ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity Example: @@ -1029,6 +1029,7 @@ and consider if they're appropriate for your deployment. - `defaultEnableMerging` ((#v-connectinject-metrics-defaultenablemerging)) (`boolean: false`) - Configures the Consul sidecar to run a merged metrics server to combine and serve both Envoy and Connect service metrics. + This feature is available only in Consul v1.10-alpha or greater. - `defaultMergedMetricsPort` ((#v-connectinject-metrics-defaultmergedmetricsport)) (`integer: 20100`) - Configures the port at which the Consul sidecar will listen on to return combined metrics. This port only needs to be changed if it conflicts with