whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into release-1.6

Browse Source
This commit is contained in:
Devin Donnelly
2017-03-08 14:51:36 -08:00
parent 3e81720c34 f7ad8644e9
commit 621465a55c
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cn/docs/.gitkeep
View File
docs/admin/garbage-collection.md
+1 -1
View File
@@ -72,4 +72,4 @@ Including:
| `--low-diskspace-threshold-mb` | `--eviction-hard` or `eviction-soft` | eviction generalizes disk thresholds to other resources | | `--low-diskspace-threshold-mb` | `--eviction-hard` or `eviction-soft` | eviction generalizes disk thresholds to other resources |
| `--outofdisk-transition-frequency` | `--eviction-pressure-transition-period` | eviction generalizes disk pressure transition to other resources | | `--outofdisk-transition-frequency` | `--eviction-pressure-transition-period` | eviction generalizes disk pressure transition to other resources |
See [kubelet eviction design doc](https://github.com/kubernetes/kubernetes.github.io/blob/master/docs/admin/out-of-resource.md) for more details. See [Configuring Out Of Resource Handling](/docs/admin/out-of-resource/) for more details.
docs/admin/out-of-resource.md
+1 -2
View File
@@ -17,8 +17,7 @@ If either resource is exhausted, the node would become unstable.
## Eviction Policy ## Eviction Policy
The `kubelet` can pro-actively monitor for and prevent against total starvation of a compute resource. In The `kubelet` can pro-actively monitor for and prevent against total starvation of a compute resource. In those cases, the `kubelet` can pro-actively fail one or more pods in order to reclaim
cases where it could appear to occur, the `kubelet` can pro-actively fail one or more pods in order to reclaim
the starved resource. When the `kubelet` fails a pod, it terminates all containers in the pod, and the `PodPhase` the starved resource. When the `kubelet` fails a pod, it terminates all containers in the pod, and the `PodPhase`
is transitioned to `Failed`. is transitioned to `Failed`.