* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  fix the link of ogging-elasticsearch-kibana.md
  View $PAGE on Github without forking the repo
  update init-containers.md
  update out-of-resource.md
This commit is contained in:
Andrew Chen
2017-03-21 15:54:53 -07:00
4 changed files with 6 additions and 3 deletions
@@ -106,7 +106,7 @@ To configure hard eviction thresholds, the following flag is supported:
* `eviction-hard` describes a set of eviction thresholds (e.g. `memory.available<1Gi`) that if met
would trigger a pod eviction.
The `kubelet` has the following default hard eviction thresholds:
The `kubelet` has the following default hard eviction threshold:
* `--eviction-hard=memory.available<100Mi`
@@ -227,7 +227,7 @@ validation error is thrown for any Container sharing a name with another.
### Resources
Given the ordering and execution for Init Containers, the following rules
for resource usage apply:
for resource usage application:
* The highest of any particular resource request or limit defined on all Init
Containers is the *effective init request/limit*