Merge pull request #21299 from wojtek-t/always_event_etcd

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-20 21:03:27 -08:00
3 changed files with 1 additions and 10 deletions

View File

@@ -76,8 +76,6 @@ When creating a cluster, existing salt scripts:
* start and configure additional etcd instance
* configure api-server to use it for storing events
However, this is done automatically only for clusters having more than 50 nodes.
### Addon Resources
To prevent memory leaks or other resource issues in [cluster addons](../../cluster/addons/) from consuming all the resources available on a node, Kubernetes sets resource limits on addon containers to limit the CPU and Memory resources they can consume (See PR [#10653](http://pr.k8s.io/10653/files) and [#10778](http://pr.k8s.io/10778/files)).