Merge branch 'master' into eparis-networkpolicy

2016-10-05 15:56:59 -07:00
parent 273ac45bb4 5fb05c5ab1
commit f382b06a16
337 changed files with 125093 additions and 12715 deletions
@@ -1,6 +1,7 @@
 ---
 assignees:
 - thockin
+- caseydavenport

 ---

@@ -47,6 +48,8 @@ To configure the annotation via `kubectl`:
 kubectl annotate ns <namespace> "net.beta.kubernetes.io/network-policy={\"ingress\": {\"isolation\": \"DefaultDeny\"}}"
 {% endraw %}```

+See the [NetworkPolicy getting started guide](/docs/getting-started-guides/network-policy/walkthrough) for an example.
+
 ## The `NetworkPolicy` Resource

 See the [api-reference](/docs/api-reference/extensions/v1beta1/definitions/#_v1beta1_networkpolicy) for a full definition of the resource.