From ca5619608c169ab37118605fa6c61cdbaa94e3a3 Mon Sep 17 00:00:00 2001 From: Darla Ahlert Date: Fri, 9 Jun 2017 09:28:47 -0500 Subject: [PATCH] Updating docs to be Calico 2.1 for consistency Change-Id: I252d244dcfc6b81eff213aa2bf13dbd802453238 --- doc/source/install/developer/minikube.rst | 2 +- doc/source/install/multinode.rst | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/doc/source/install/developer/minikube.rst b/doc/source/install/developer/minikube.rst index cf68f885ee..6f79d795a4 100644 --- a/doc/source/install/developer/minikube.rst +++ b/doc/source/install/developer/minikube.rst @@ -121,7 +121,7 @@ Note which versions of Calico are recommended for the project in our :: - kubectl create -f http://docs.projectcalico.org/v2.0/getting-started/kubernetes/installation/hosted/calico.yaml + kubectl create -f http://docs.projectcalico.org/v2.1/getting-started/kubernetes/installation/hosted/calico.yaml Wait for the environment to come up without error (like shown below). diff --git a/doc/source/install/multinode.rst b/doc/source/install/multinode.rst index f824877d4f..be89fdceae 100644 --- a/doc/source/install/multinode.rst +++ b/doc/source/install/multinode.rst @@ -78,8 +78,8 @@ Deploying a CNI-Enabled SDN (Calico) After an initial ``kubeadmn`` deployment has been scheduled, it is time to deploy a CNI-enabled SDN. We have selected **Calico**, but have also confirmed that this works for Weave, and Romana. For Calico version -v2.0, you can apply the provided `Kubeadm Hosted -Install `_ +v2.1, you can apply the provided `Kubeadm Hosted +Install `_ manifest: :: @@ -88,17 +88,6 @@ manifest: .. note:: - For Calico deployments using v2.0, if you are using a 192.168.0.0/16 - CIDR for your Kubernetes hosts, you will need to modify `line 42 - `__ - for the ``cidr`` declaration within the ``ippool``. This must be a - ``/16`` range or more, as the ``kube-controller`` will hand out ``/24`` - ranges to each node. We have included a sample comparison of the changes - `here `__ - and - `here `__. - This is not applicable for Calico v2.1. - After the container CNI-SDN is deployed, Calico has a tool you can use to verify your deployment. You can download this tool, ```calicoctl`` `__ @@ -125,7 +114,7 @@ manifest: admin@kubenode01:~$ It is important to call out that the Self Hosted Calico manifest for - v2.0 (above) supports ``nodetonode`` mesh, and ``nat-outgoing`` by + v2.1 (above) supports ``nodetonode`` mesh, and ``nat-outgoing`` by default. This is a change from version 1.6. Setting Up RBAC