Merge branch 'master' into update-minikube-docs

docs/getting-started-guides/index.md

@@ -27,7 +27,7 @@ a Kubernetes cluster from scratch.
 
 ### Local-machine Solutions
 
-[Minikube](/docs/getting-started-guides/minikube/) is the recommended method for you to create a single node kubernetes cluster locally for purposes of development and testing. Setup is completely automated and doesn't require a cloud provider account.  
+[Minikube](/docs/getting-started-guides/minikube/) is the recommended method for you to create a single node kubernetes cluster locally for purposes of development and testing. Setup is completely automated and doesn't require a cloud provider account.
 
 Use the [Minikube getting started guide](/docs/getting-started-guides/minikube/) to try it out.
 
@@ -45,6 +45,8 @@ clusters.
 
 [Platform9](https://platform9.com/products/kubernetes/) offers managed Kubernetes on-premises or any public cloud, and provides 24/7 health monitoring and alerting.
 
+[OpenShift Dedicated](https://www.openshift.com/dedicated/) offers managed Kubernetes clusters powered by OpenShift and [OpenShift Online](https://www.openshift.com/features/) provides free hosted access for Kubernetes applications.
+
 ### Turn-key Cloud Solutions
 
 These solutions allow you to create Kubernetes clusters on a range of Cloud IaaS providers with only a

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.
 

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.