diff --git a/docs/admin/cluster-large.md b/docs/admin/cluster-large.md index 4a32fe98ba..34f2e48870 100644 --- a/docs/admin/cluster-large.md +++ b/docs/admin/cluster-large.md @@ -7,11 +7,11 @@ title: Building Large Clusters ## Support -At {{page.version}}, Kubernetes supports clusters with up to 1000 nodes. More specifically, we support configurations that meet *all* of the following criteria: +At {{page.version}}, Kubernetes supports clusters with up to 5000 nodes. More specifically, we support configurations that meet *all* of the following criteria: -* No more than 2000 nodes -* No more than 60000 total pods -* No more than 120000 total containers +* No more than 5000 nodes +* No more than 150000 total pods +* No more than 300000 total containers * No more than 100 pods per node
diff --git a/docs/concepts/storage/volumes.md b/docs/concepts/storage/volumes.md index 54713a9ffc..ead665d68f 100644 --- a/docs/concepts/storage/volumes.md +++ b/docs/concepts/storage/volumes.md @@ -289,10 +289,10 @@ spec: ### nfs -An `nfs` volume allows an existing NFS (Network File System) share to be +A `nfs` volume allows an existing NFS (Network File System) share to be mounted into your pod. Unlike `emptyDir`, which is erased when a Pod is removed, the contents of an `nfs` volume are preserved and the volume is merely -unmounted. This means that an NFS volume can be pre-populated with data, and +unmounted. This means that a NFS volume can be pre-populated with data, and that data can be "handed off" between pods. NFS can be mounted by multiple writers simultaneously. @@ -322,7 +322,7 @@ See the [iSCSI example](https://github.com/kubernetes/kubernetes/tree/{{page.git ### fc (fibre channel) -An `fc` volume allows an existing fibre channel volume to be mounted into your pod. +A `fc` volume allows an existing fibre channel volume to be mounted into your pod. You can specify single or multiple target World Wide Names to the parameter targetWWNs in your volume configuration. If multiple WWNs are specified, targetWWNs expects that those WWNs form multipath connection. @@ -365,7 +365,7 @@ See the [GlusterFS example](https://github.com/kubernetes/kubernetes/tree/{{page ### rbd -An `rbd` volume allows a [Rados Block +A `rbd` volume allows a [Rados Block Device](http://ceph.com/docs/master/rbd/rbd/) volume to be mounted into your pod. Unlike `emptyDir`, which is erased when a Pod is removed, the contents of a `rbd` volume are preserved and the volume is merely unmounted. This diff --git a/docs/reference/client-libraries.md b/docs/reference/client-libraries.md index 70f5fe7588..0738ccc620 100644 --- a/docs/reference/client-libraries.md +++ b/docs/reference/client-libraries.md @@ -49,6 +49,7 @@ their authors, not the Kubernetes team. | PHP | [github.com/devstub/kubernetes-api-php-client](https://github.com/devstub/kubernetes-api-php-client) | | PHP | [github.com/maclof/kubernetes-client](https://github.com/maclof/kubernetes-client) | | Python | [github.com/eldarion-gondor/pykube](https://github.com/eldarion-gondor/pykube) | +| Python | [github.com/mnubo/kubernetes-py](https://github.com/mnubo/kubernetes-py) | | Ruby | [github.com/Ch00k/kuber](https://github.com/Ch00k/kuber) | | Ruby | [github.com/abonas/kubeclient](https://github.com/abonas/kubeclient) | | Scala | [github.com/doriordan/skuber](https://github.com/doriordan/skuber) |