From 1bcb4cd558356dcdb44035e4a3813341f4f0fc2b Mon Sep 17 00:00:00 2001 From: Justin Peterson Date: Tue, 22 Nov 2016 19:15:40 -0800 Subject: [PATCH 1/4] Fix for Issue 1767 --- .../public/images/module_01_cluster.svg | 582 ++++++------------ 1 file changed, 177 insertions(+), 405 deletions(-) diff --git a/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg b/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg index 054a9f78eb..e1f92dace0 100644 --- a/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg +++ b/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg @@ -1,9 +1,6 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Docker + Kubelt + + + Layer 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1f685261595f13d238aaf7ba52f1d9f67fd3f508 Mon Sep 17 00:00:00 2001 From: Vincenzo Ferrari Date: Wed, 23 Nov 2016 11:12:07 +0100 Subject: [PATCH 2/4] updated dockerimage link removed dead link of dockerimage --- docs/user-guide/images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/images.md b/docs/user-guide/images.md index e739bb0ca9..582961593f 100644 --- a/docs/user-guide/images.md +++ b/docs/user-guide/images.md @@ -5,7 +5,7 @@ assignees: --- -Each container in a pod has its own image. Currently, the only type of image supported is a [Docker Image](https://docs.docker.com/userguide/dockerimages/). +Each container in a pod has its own image. Currently, the only type of image supported is a [Docker Image](https://docs.docker.com/engine/tutorials/dockerimages/). You create your Docker image and push it to a registry before referring to it in a Kubernetes pod. From 5a54ed400cde4693c055d9bbe0fd1c8d892a8694 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 23 Nov 2016 14:25:09 +0000 Subject: [PATCH 3/4] Clarify that no add-ons are preferred above others --- docs/getting-started-guides/network-policy/walkthrough.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-guides/network-policy/walkthrough.md b/docs/getting-started-guides/network-policy/walkthrough.md index 49da17e6ef..8384bcdb34 100644 --- a/docs/getting-started-guides/network-policy/walkthrough.md +++ b/docs/getting-started-guides/network-policy/walkthrough.md @@ -11,7 +11,7 @@ In this article, we assume a Kubernetes cluster has been created with network po * [Calico](/docs/getting-started-guides/network-policy/calico/) * [Romana](/docs/getting-started-guides/network-policy/romana/) -The reference implementation is [Calico](/docs/getting-started-guides/network-policy/calico) running on GCE. +Add-ons are sorted alphabetically - the ordering does not imply any preferential status. The following example walkthrough will work on a Kubernetes cluster using any of the listed providers. From c01aaba15624a04e858247220afac6f14edc5a7c Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 23 Nov 2016 14:15:35 +0000 Subject: [PATCH 4/4] Add Weave to the list of NetworkPolicy implementations --- .../network-policy/walkthrough.md | 1 + docs/getting-started-guides/network-policy/weave.md | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 docs/getting-started-guides/network-policy/weave.md diff --git a/docs/getting-started-guides/network-policy/walkthrough.md b/docs/getting-started-guides/network-policy/walkthrough.md index 49da17e6ef..973903ceed 100644 --- a/docs/getting-started-guides/network-policy/walkthrough.md +++ b/docs/getting-started-guides/network-policy/walkthrough.md @@ -10,6 +10,7 @@ In this article, we assume a Kubernetes cluster has been created with network po * [Calico](/docs/getting-started-guides/network-policy/calico/) * [Romana](/docs/getting-started-guides/network-policy/romana/) +* [Weave Net](/docs/getting-started-guides/network-policy/weave/) The reference implementation is [Calico](/docs/getting-started-guides/network-policy/calico) running on GCE. diff --git a/docs/getting-started-guides/network-policy/weave.md b/docs/getting-started-guides/network-policy/weave.md new file mode 100644 index 0000000000..8d5896861d --- /dev/null +++ b/docs/getting-started-guides/network-policy/weave.md @@ -0,0 +1,11 @@ +--- +assignees: +- bboreham + +--- + +The [Weave Net Addon](https://www.weave.works/docs/net/latest/kube-addon/) for Kubernetes comes with a Network Policy Controller. + +This component automatically monitors Kubernetes for any NetworkPolicy annotations on all namespaces, and configures `iptables` rules to allow or block traffic as directed by the policies. + +Once you have installed the Weave Net Addon you can follow the [NetworkPolicy gettting started guide](/docs/getting-started-guides/network-policy/walkthrough) to try out Kubernetes NetworkPolicy.