From 1c5d54cb29e6940009285cda8e575971bfbe9eec Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 7 Dec 2022 10:08:24 -0800 Subject: [PATCH] docs: Small docs updates, peering and K8s CNI (#15702) --- website/content/docs/connect/config-entries/index.mdx | 4 ++-- website/content/docs/k8s/installation/install.mdx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/website/content/docs/connect/config-entries/index.mdx b/website/content/docs/connect/config-entries/index.mdx index ec92c57b2a..23e3d0bd23 100644 --- a/website/content/docs/connect/config-entries/index.mdx +++ b/website/content/docs/connect/config-entries/index.mdx @@ -17,8 +17,8 @@ The following configuration entries are supported: - [Mesh](/docs/connect/config-entries/mesh) - controls mesh-wide configuration that applies across namespaces and federated datacenters. -- [Exported Services](/docs/connect/config-entries/exported-services) - enables - Consul to export service instances to other admin partitions. +- [Exported Services](/docs/connect/config-entries/exported-services) - enables + Consul to export service instances to other peers or to other admin partitions local or remote to the datacenter. - [Proxy Defaults](/docs/connect/config-entries/proxy-defaults) - controls proxy configuration diff --git a/website/content/docs/k8s/installation/install.mdx b/website/content/docs/k8s/installation/install.mdx index a2b9e721ed..138fdbb985 100644 --- a/website/content/docs/k8s/installation/install.mdx +++ b/website/content/docs/k8s/installation/install.mdx @@ -25,7 +25,7 @@ The Helm chart has no required configuration, so it installs a Consul cluster wi ## Requirements -Using the Helm Chart requires Helm version 3.2+. Visit the [Helm website](https://helm.sh/docs/intro/install/) to download the latest version. +Using the Helm Chart requires Helm version 3.6+. Visit the [Helm website](https://helm.sh/docs/intro/install/) to download the latest version. ## Install Consul @@ -177,11 +177,11 @@ To configure the plugin to be installed, add the following configuration to your The following table describes the available CNI plugin options: -| Option | Description | Default | -| --- | --- | --- | +| Option | Description | Default | +| ---------- | ----------- | ------------- | | `cni.enabled` | Boolean value that enables or disables the CNI plugin. If `true`, the plugin is responsible for redirecting traffic in the service mesh. If `false`, redirection is handled by the `connect-inject init` container. | `false` | | `cni.logLevel` | String value that specifies the log level for the installer and plugin. You can specify the following values: `info`, `debug`, `error`. | `info` | -| `cni.namespace` | Set the namespace to install the CNI plugin into. Overrides global namespace settings for CNI resources. Ex: `kube-system` | `consul` | +| `cni.namespace` | Set the namespace to install the CNI plugin into. Overrides global namespace settings for CNI resources, for example `kube-system` | namespace used for `consul-k8s` install, for example `consul` | | `cni.multus` | Boolean value that enables multus CNI plugin support. If `true`, multus will be enabled. If `false`, Consul CNI will operate as a chained plugin. | `false` | | `cni.cniBinDir` | String value that specifies the location on the Kubernetes node where the CNI plugin is installed. | `/opt/cni/bin` | | `cni.cniNetDir` | String value that specifies the location on the Kubernetes node for storing the CNI configuration. | `/etc/cni/net.d` |