From 84fe5ae0696b1642a60f45e50541e02b5e070246 Mon Sep 17 00:00:00 2001 From: Anita Buehrle Date: Thu, 21 Apr 2016 15:24:15 -0500 Subject: [PATCH] Update Weave Net information from Weaveworks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Please move the Weave section above Flannel and include the following text: ### 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. --- docs/admin/networking.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/admin/networking.md b/docs/admin/networking.md index 22a2fb8ba2..653e147abf 100644 --- a/docs/admin/networking.md +++ b/docs/admin/networking.md @@ -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 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](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 "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