Merge pull request #1224 from chadell/patch-1

Automatic merge from submit-queue. Add Cilium as another network implementation option
kubernetes · Oct 18, 2017 · 135ee1b · 135ee1b
2 parents f4dde60 + c014508
commit 135ee1b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/contributors/design-proposals/network/networking.md b/contributors/design-proposals/network/networking.md
@@ -123,6 +123,7 @@ to serve the purpose outside of GCE.
     overlay network, primarily aiming at Docker integration.
   - [Calico](https://github.com/Metaswitch/calico) uses BGP to enable real
     container IPs.
+  - [Cilium](https://github.com/cilium/cilium) supports Overlay Network mode (IPv4/IPv6) and Direct Routing model (IPv6)
 
 ## Pod to service