Files
kubernetes/cluster/images
k8s-merge-robot f9a45e6983 Merge pull request #28673 from cheld/add-cni-config
Automatic merge from submit-queue

add default flannel configuration for cni

I added a default flannel configuration for cni.

So hyperkube can be started with:
```
--network-plugin=kubenet
```
or with flannel:

```
--network-plugin=cni
--network-plugin-dir=/etc/cni/net.d
```

Requires update of cni binaries to 0.3.0 or later to work. See also https://github.com/kubernetes/kubernetes/issues/27603

This PR is intended to support multi-node Hyperkube 
https://github.com/kubernetes/kube-deploy/pull/115



CC @zreigz  

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-13 14:42:07 -07:00
..