Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge latest from Master into Release 1.6 #2739

Merged
merged 6 commits into from
Mar 8, 2017
Merged

Merge latest from Master into Release 1.6 #2739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd77dea
Update garbage-collection.md
Mar 7, 2017
0e04403
update garbage-collection.md
Mar 7, 2017
04d1219
update out-of-resource.md
Mar 7, 2017
582ef6d
update out-of-resource.md
Mar 7, 2017
f7ad864
Create a top-level CN directory to hold future md files for the Chine…
xinzhangcmu Mar 6, 2017
621465a
Merge remote-tracking branch 'upstream/master' into release-1.6
devin-donnelly Mar 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added cn/docs/.gitkeep
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion docs/admin/garbage-collection.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ Including:
| `--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 |

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.
3 changes: 1 addition & 2 deletions docs/admin/out-of-resource.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ If either resource is exhausted, the node would become unstable.

## Eviction Policy

The `kubelet` can pro-actively monitor for and prevent against total starvation of a compute resource. In
cases where it could appear to occur, the `kubelet` can pro-actively fail one or more pods in order to reclaim
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
the starved resource. When the `kubelet` fails a pod, it terminates all containers in the pod, and the `PodPhase`
is transitioned to `Failed`.

Expand Down