Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Docs: Add OpenShift CNI to list of install options for kubernetes into release/1.13.x #14823

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion website/content/docs/k8s/installation/install.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Because the plugin is executed by the local Kubernetes kubelet, the plugin alrea
The Consul Helm Chart is responsible for installing the Consul CNI plugin.
To configure the plugin to be installed, add the following configuration to your `config.yaml` file:

<CodeTabs tabs={[ "Reference configuration","GKE configuration" ]}>
<CodeTabs tabs={[ "Reference configuration","GKE configuration","OpenShift configuration" ]}>

<CodeBlockConfig filename="config.yaml">

Expand Down Expand Up @@ -151,6 +151,24 @@ connectInject:
```
</CodeBlockConfig>

<CodeBlockConfig filename="values.yaml">

```yaml
global:
name: consul
openshift:
enabled: true
connectInject:
enabled: true
cni:
enabled: true
logLevel: info
multus: true
cniBinDir: "/var/lib/cni/bin"
cniNetDir: "/etc/kubernetes/cni/net.d"
```
</CodeBlockConfig>

</CodeTabs>


Expand All @@ -160,6 +178,7 @@ The following table describes the available CNI plugin options:
| --- | --- | --- |
| `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.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` |

Expand Down