docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed --cni-url-installer since it's deprecated for the next release.

This commit is contained in:
Anne Henmi 2018-10-17 09:53:40 -06:00
parent efb5b3c204
commit af2ef50387
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ee/ucp/kubernetes/install-cni-plugin.md
View File

@ -4,13 +4,18 @@ description: Learn how to install a Container Networking Interface plugin on Doc
keywords: ucp, cli, administration, kubectl, Kubernetes, cni, Container Networking Interface, flannel, weave, ipip, calico
---
> BETA DISCLAIMER
>
> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice.
For Docker Universal Control Plane, [Project Calico](https://docs.projectcalico.org/v3.0/introduction/)
provides the secure networking functionality for the container communication with Kubernetes.
UCP supports third-party Container Networking Interface (CNI) plugins by using the `--cni-installer-url`
option. By default, Docker EE installs the built-in [Calico](https://github.com/projectcalico/cni-plugin)
plugin, but you can override the default and install a Docker certified plugin.
UCP supports third-party Container Networking Interface (CNI) plugins. By default, Docker EE
installs the built-in [Calico](https://github.com/projectcalico/cni-plugin) plugin, but you
can override the default and install a Docker certified plugin.
***NOTE:*** The `--cni-installer-url` option is deprecated as of the EE 2.1 release.
# Install UCP with a custom CNI plugin

1
reference/ucp/3.0/cli/install.md
View File

@ -60,7 +60,6 @@ command.
| `--kube-apiserver-port` | Port for the Kubernetes API server (default: 6443) |
| `--swarm-port` | Port for the Docker Swarm manager. Used for backwards compatibility |
| `--swarm-grpc-port` | Port for communication between nodes |
| `--cni-installer-url` | A URL pointing to a Kubernetes YAML file to be used as an installer for the CNI plugin of the cluster. If specified, the default CNI plugin is not installed. If the URL uses the HTTPS scheme, no certificate verification is performed. |
| `--pod-cidr` | Kubernetes cluster IP pool for the pods to allocated IPs from (Default: 192.168.0.0/16) |
| `--cloud-provider` | The cloud provider for the cluster |
| `--dns` | Set custom DNS servers for the UCP containers |

1
reference/ucp/3.0/cli/upgrade.md
View File

@ -45,4 +45,3 @@ healthy and that all nodes have been upgraded successfully.
| `--pod-cidr` | Kubernetes cluster IP pool for the pods to allocated IP from (Default: 192.168.0.0/16 |
| `--nodeport-range` | Allowed port range for Kubernetes services of type NodePort (Default: 32768-35535) |
| `--cloud-provider` | The cloud provider for the cluster |
| `--cni-installer-url` | A URL pointing to a kubernetes YAML file to be used as an installer for the CNI plugin of the cluster |