Revision 9bb831a5bd5f4022aec571e39759ecbc2f4088a7 authored by André Martins on 23 January 2019, 12:22:04 UTC, committed by Ian Vernon on 29 January 2019, 16:49:19 UTC
[ upstream commit 80ea41a1701450f57f052ad64865af5e0149dd71 ] As flannel runs with the name "cbr0" by default in its cni configuration, in order for Cilium to be able to run on top of flannel with existing containers, the flannel-cilium CNI configuration file needs to have the same name. By having the same name it prevents the flannel IPAM assigning existing addresses as they are stored on each node under the directory `/var/lib/cni/networks/cbr0/`. Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Joe Stringer <joe@cilium.io>
1 parent 35b554c
| File | Mode | Size |
|---|---|---|
| .github | ||
| .travis | ||
| Documentation | ||
| api | ||
| bpf | ||
| bugtool | ||
| cilium | ||
| cilium-health | ||
| common | ||
| contrib | ||
| daemon | ||
| envoy | ||
| examples | ||
| hack | ||
| monitor | ||
| operator | ||
| pkg | ||
| plugins | ||
| proxylib | ||
| test | ||
| tests | ||
| tools | ||
| vendor | ||
| .authors.aux | -rw-r--r-- | 416 bytes |
| .gitignore | -rw-r--r-- | 857 bytes |
| .gitmodules | -rw-r--r-- | 0 bytes |
| .mailmap | -rw-r--r-- | 737 bytes |
| .travis.yml | -rw-r--r-- | 424 bytes |
| AUTHORS | -rw-r--r-- | 5.6 KB |
| CODEOWNERS | -rw-r--r-- | 1.1 KB |
| CONTRIBUTING.md | -rw-r--r-- | 193 bytes |
| Dockerfile | -rw-r--r-- | 1.9 KB |
| Dockerfile.builder | -rw-r--r-- | 1.1 KB |
| Gopkg.lock | -rw-r--r-- | 33.4 KB |
| Gopkg.toml | -rw-r--r-- | 12.5 KB |
| Jenkinsfile.nightly | -rw-r--r-- | 4.7 KB |
| LICENSE | -rw-r--r-- | 11.1 KB |
| Makefile | -rw-r--r-- | 11.5 KB |
| Makefile.defs | -rw-r--r-- | 1.3 KB |
| Makefile.quiet | -rw-r--r-- | 456 bytes |
| NEWS.rst | -rw-r--r-- | 20 bytes |
| README.rst | -rw-r--r-- | 14.7 KB |
| VERSION | -rw-r--r-- | 10 bytes |
| Vagrantfile | -rw-r--r-- | 11.9 KB |
| cilium-docker-plugin.Dockerfile | -rw-r--r-- | 511 bytes |
| cilium-operator.Dockerfile | -rw-r--r-- | 507 bytes |
| docs.Jenkinsfile | -rw-r--r-- | 2.6 KB |
| flannel.Jenkinsfile | -rw-r--r-- | 3.2 KB |
| ginkgo-kubernetes-all.Jenkinsfile | -rw-r--r-- | 6.5 KB |
| ginkgo.Jenkinsfile | -rw-r--r-- | 4.2 KB |
| kubernetes-upstream.Jenkinsfile | -rw-r--r-- | 4.2 KB |
Computing file changes ...
