diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-10-18 11:21:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 11:21:51 -0700 |
| commit | 135ee1b75acbbd3375a3a3a3cc366cbb02dcb56b (patch) | |
| tree | 99ff357262d89d37fc6c5d099cc24c35390a9242 | |
| parent | f4dde602ee67313e444f101035d627c901643264 (diff) | |
| parent | c0145082466f9870ebbd061ed5b3bb5118e26e96 (diff) | |
Merge pull request #1224 from chadell/patch-1
Automatic merge from submit-queue.
Add Cilium as another network implementation option
| -rw-r--r-- | contributors/design-proposals/network/networking.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contributors/design-proposals/network/networking.md b/contributors/design-proposals/network/networking.md index df8c8f82..89b600df 100644 --- 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 |