Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io: networking.md: Add reference to the Cilium network plugin Fix typo in cluster api docs [Kubeadm] bugfix in the index listing
This commit is contained in:
@@ -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
|
The following networking options are sorted alphabetically - the order does not
|
||||||
imply any preferential status.
|
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
|
||||||
|
|
||||||
[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.
|
[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.
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ assignees:
|
|||||||
|
|
||||||
* [kubectl](/docs/user-guide/kubectl-overview) - Main CLI tool for running commands and managing Kubernetes clusters.
|
* [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.
|
* [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
|
## Config Reference
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
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
|
### Directly accessing the REST API
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user