diff --git a/docs/getting-started-guides/network-policy/walkthrough.md b/docs/getting-started-guides/network-policy/walkthrough.md index 49da17e6ef..4f1b4e8c30 100644 --- a/docs/getting-started-guides/network-policy/walkthrough.md +++ b/docs/getting-started-guides/network-policy/walkthrough.md @@ -10,8 +10,9 @@ 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. +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. 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. 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 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.