From 16f7d2cd26bc8bea75192c100900ef465bf2cc13 Mon Sep 17 00:00:00 2001 From: Xinfeng Liu Date: Tue, 1 May 2018 11:03:22 +0800 Subject: [PATCH] Change calicoctl version to 3.1.1 for 'Disable IP in IP overlay tunneling' calicoctl 1.6.x does not work for this doc in UCP3.0 environment, suggest to use Calico 3.x. Note: the ippool yaml spec changed from v1 to v3, I'm not sure if only modifying "ipipMode: Never" is correct, please confirm with folks of network team. --- ee/ucp/kubernetes/install-cni-plugin.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ee/ucp/kubernetes/install-cni-plugin.md b/ee/ucp/kubernetes/install-cni-plugin.md index 69ea09fb33..b16cf194d8 100644 --- a/ee/ucp/kubernetes/install-cni-plugin.md +++ b/ee/ucp/kubernetes/install-cni-plugin.md @@ -71,14 +71,13 @@ commands on the Kubernetes master node to disable IPIP overlay tunneling. # Exec into the Calico Kubernetes controller container. docker exec -it $(docker ps --filter name=k8s_calico-kube-controllers_calico-kube-controllers -q) sh -# Download calicoctl, which must be included in the container image. -apk update && apk add ca-certificates && update-ca-certificates && apk add openssl -wget https://github.com/projectcalico/calicoctl/releases/download/v1.6.3/calicoctl +# Download calicoctl +wget https://github.com/projectcalico/calicoctl/releases/download/v3.1.1/calicoctl # Get the IP pool configuration. ./calicoctl get ippool -o yaml > ippool.yaml -# Edit the file: Disable IPIP in ippool.yaml by setting "enabled: false". +# Edit the file: Disable IPIP in ippool.yaml by setting "ipipMode: Never". # Apply the edited file to the Calico plugin. ./calicoctl apply -f ippool.yaml @@ -91,4 +90,4 @@ in environments where it's supported. ## Where to go next - [Install UCP for production](../admin/install.md) -- [Deploy a workload to a Kubernetes cluster](../kubernetes.md) \ No newline at end of file +- [Deploy a workload to a Kubernetes cluster](../kubernetes.md)