whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #419 from abuehrle/patch-1

Browse Source 
Update Weave Net information from Weaveworks
This commit is contained in:
johndmulhausen
2016-04-26 11:41:08 -07:00
parent 55ff9c2917 84fe5ae069
commit 65a0dfe51a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/networking.md
+9 -4
View File
@@ -154,6 +154,15 @@ Follow the "With Linux Bridge devices" section of [this very nice
tutorial](http://blog.oddbit.com/2014/08/11/four-ways-to-connect-a-docker/) from tutorial](http://blog.oddbit.com/2014/08/11/four-ways-to-connect-a-docker/) from
Lars Kellogg-Stedman. Lars Kellogg-Stedman.
### Weave Net from Weaveworks
[Weave Net](https://www.weave.works/documentation/net-1-5-0-introducing-weave/) is a
resilient and simple to use network for Kubernetes and its hosted applications.
Weave Net runs as a [CNI plug-in](https://www.weave.works/documentation/net-1-5-0-cni-plugin/)
or stand-alone. In either version, it doesn’t require any configuration or extra code
to run, and in both cases, the network provides one IP address per pod - as is standard for Kubernetes.
### Flannel ### Flannel
[Flannel](https://github.com/coreos/flannel#flannel) is a very simple overlay [Flannel](https://github.com/coreos/flannel#flannel) is a very simple overlay
@@ -167,10 +176,6 @@ people have reported success with Flannel and Kubernetes.
complicated way to build an overlay network. This is endorsed by several of the complicated way to build an overlay network. This is endorsed by several of the
"Big Shops" for networking. "Big Shops" for networking.
### Weave
[Weave](https://github.com/zettio/weave) is yet another way to build an overlay
network, primarily aiming at Docker integration.
### Calico ### Calico