From 689201479229c878bd5b1baadfae3f541999f22b Mon Sep 17 00:00:00 2001 From: Irfan Ur Rehman Date: Wed, 31 May 2017 23:16:59 +0530 Subject: [PATCH 1/3] [Kubeadm] bugfix in the index listing --- docs/reference/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/index.md b/docs/reference/index.md index 18c8ca9faf..4ef45372e3 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -15,7 +15,7 @@ assignees: * [kubectl](/docs/user-guide/kubectl-overview) - Main CLI tool for running commands and managing Kubernetes clusters. * [JSONPath](/docs/user-guide/jsonpath/) - Syntax guide for using [JSONPath expressions](http://goessner.net/articles/JsonPath/) with kubectl. -* [kubeadm](/docs/admin/kubeadm/) - CLI tool to +* [kubeadm](/docs/admin/kubeadm/) - CLI tool to easily provision a secure Kubernetes cluster ## Config Reference From 5372429718e115674af180b55972fffa3a966887 Mon Sep 17 00:00:00 2001 From: Kenny Lee Sin Cheong Date: Wed, 31 May 2017 00:30:17 -0400 Subject: [PATCH 2/3] Fix typo in cluster api docs Fix type in https://kubernetes.io/docs/tasks/administer-cluster/access-cluster-api/ --- docs/tasks/administer-cluster/access-cluster-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tasks/administer-cluster/access-cluster-api.md b/docs/tasks/administer-cluster/access-cluster-api.md index 4657cd6901..4f162f40f9 100644 --- a/docs/tasks/administer-cluster/access-cluster-api.md +++ b/docs/tasks/administer-cluster/access-cluster-api.md @@ -36,7 +36,7 @@ $ kubectl config view ``` Many of the [examples](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/) provide an introduction to using -kubectl. omplete documentation is found in the [kubectl manual](/docs/user-guide/kubectl/index). +kubectl. Complete documentation is found in the [kubectl manual](/docs/user-guide/kubectl/index). ### Directly accessing the REST API From 42f0b93b684f1f3ffdc191b90fd040bdb1b6aa40 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Tue, 30 May 2017 15:26:03 +0200 Subject: [PATCH 3/3] networking.md: Add reference to the Cilium network plugin Signed-off-by: Thomas Graf --- docs/concepts/cluster-administration/networking.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/concepts/cluster-administration/networking.md b/docs/concepts/cluster-administration/networking.md index b223279176..ef1a7c3af6 100644 --- a/docs/concepts/cluster-administration/networking.md +++ b/docs/concepts/cluster-administration/networking.md @@ -106,6 +106,14 @@ as an introduction to various technologies and serves as a jumping-off point. The following networking options are sorted alphabetically - the order does not imply any preferential status. +### Cilium + +[Cilium](https://github.com/cilium/cilium) is open source software for +providing and transparently securing network connectivity between application +containers. Cilium is L7/HTTP aware and can enforce network policies on L3-L7 +using an identity based security model that is decoupled from network +addressing. + ### Contiv [Contiv](https://github.com/contiv/netplugin) provides configurable networking (native l3 using BGP, overlay using vxlan, classic l2, or Cisco-SDN/ACI) for various use cases. [Contiv](http://contiv.io) is all open sourced.