From 2232e063aa1e41d044d66a700fc1caa49e2e5d61 Mon Sep 17 00:00:00 2001 From: Chris Marino Date: Mon, 24 Oct 2016 16:00:28 -0700 Subject: [PATCH] Edits for consistency.. Kubeadmin, etc. --- docs/admin/addons.md | 2 +- docs/getting-started-guides/network-policy/romana.md | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/admin/addons.md b/docs/admin/addons.md index 5e6573d349..4924efd604 100644 --- a/docs/admin/addons.md +++ b/docs/admin/addons.md @@ -12,7 +12,7 @@ This page lists some of the available add-ons and links to their respective inst * [Weave Net](https://github.com/weaveworks/weave-kube) provides networking and network policy, will carry on working on both sides of a network partition, and does not require an external database. * [Calico](https://github.com/projectcalico/calico-containers/tree/master/docs/cni/kubernetes/manifests/kubeadm) is a secure L3 networking and network policy provider. * [Canal](https://github.com/tigera/canal/tree/master/k8s-install/kubeadm) unites Flannel and Calico, providing networking and network policy. -* [Romana](http://romana.io) is a Layer 3 networking solution for network policy. Kubeadmin add-on installation details available [here](https://github.com/romana/romana/tree/master/containerize). +* [Romana](http://romana.io) is a Layer 3 networking solution for pod networks that also supports the [NetworkPolicy API(/docs/user-guide/networkpolicies/). Kubeadmin add-on installation details available [here](https://github.com/romana/romana/tree/master/containerize). ## Visualization & Control diff --git a/docs/getting-started-guides/network-policy/romana.md b/docs/getting-started-guides/network-policy/romana.md index 26ca728490..c25835ebb0 100644 --- a/docs/getting-started-guides/network-policy/romana.md +++ b/docs/getting-started-guides/network-policy/romana.md @@ -4,14 +4,14 @@ assignees: --- -# Installation with kubeadmin +# Installation with kubeadm -Begin by following the [kubeadm getting started guide](/docs/getting-started-guides/kubeadm/) and complete steps 1, 2, and 3. +Begin by following the [kubeadm getting started guide](/docs/getting-started-guides/kubeadm/) and complete steps 1, 2, and 3. Once completed, follow the [containerized installation guide](https://github.com/romana/romana/tree/master/containerize) for kubeadmin. Kubernetes network policies can then be applied to pods using the NetworkPolicy API. -Once completed, follow the [containerized installation guide](https://github.com/romana/romana/tree/master/containerize) for kubeadmin. +#### Additional Romana Network Policy Options -## Romana Network Policy Resources +In addition to the standard Kubernetes NetworkPolicy API, Romana also supports additional network policy functions. -* [Overview of Romana Network Policy](https://github.com/romana/romana/wiki/Romana-policies) -* [Example Policies](https://github.com/romana/core/tree/master/policy) +* [Romana Network Policy Capabilities](https://github.com/romana/romana/wiki/Romana-policies) +* [Example Romana Policies](https://github.com/romana/core/tree/master/policy)