Merge pull request #2629 from Shimi/patch-1

Weave daemonset configuration for k8s 1.6.x
This commit is contained in:
Chris Love 2017-05-25 00:37:57 -06:00 committed by GitHub
commit 1fffa08673
1 changed files with 6 additions and 2 deletions

View File

@ -91,12 +91,16 @@ step is to install CNI networking. Most of the CNI network providers are
moving to installing their components plugins via a Daemonset. For instance weave will
install with the following command:
Daemonset installation for K8s 1.6.x or above.
```console
$ kubectl create -f https://git.io/weave-kube-1.6
```
Daemonset installation for K8s 1.4.x or 1.5.x.
```console
$ kubectl create -f https://git.io/weave-kube
```
The above daemonset installation requires K8s 1.4.x or above.
### Calico Example for CNI and Network Policy
#### Installing Calico on a new Cluster