From dd77deabedfb70e371d0dfcafd42be55b42ea790 Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Tue, 7 Mar 2017 19:06:29 +0800 Subject: [PATCH 1/5] Update garbage-collection.md modify the url and link --- docs/admin/garbage-collection.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/garbage-collection.md b/docs/admin/garbage-collection.md index ece46c7e07100..3124de50b8767 100644 --- a/docs/admin/garbage-collection.md +++ b/docs/admin/garbage-collection.md @@ -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](https://kubernetes.io/docs/admin/out-of-resource/) for more details. From 0e0440367cb01e16ec70e1d79bba18199fc5a4d0 Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Wed, 8 Mar 2017 05:49:37 +0800 Subject: [PATCH 2/5] update garbage-collection.md change the url to relative path. --- docs/admin/garbage-collection.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/garbage-collection.md b/docs/admin/garbage-collection.md index 3124de50b8767..ad7eabad9db1d 100644 --- a/docs/admin/garbage-collection.md +++ b/docs/admin/garbage-collection.md @@ -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 [Configuring Out Of Resource Handling](https://kubernetes.io/docs/admin/out-of-resource/) for more details. +See [Configuring Out Of Resource Handling](/docs/admin/out-of-resource/) for more details. From 04d12196a12737e8366fbdea64a43f2b3c0982ab Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Tue, 7 Mar 2017 16:57:01 +0800 Subject: [PATCH 3/5] update out-of-resource.md change "in cases when" to "in case that" --- docs/admin/out-of-resource.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/out-of-resource.md b/docs/admin/out-of-resource.md index 30b8744624448..acbc5e7a8b3e8 100644 --- a/docs/admin/out-of-resource.md +++ b/docs/admin/out-of-resource.md @@ -18,7 +18,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 +case that it appears 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` is transitioned to `Failed`. From 582ef6dc4bee43a20b09b0a67d80c840f29883c5 Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Wed, 8 Mar 2017 05:54:37 +0800 Subject: [PATCH 4/5] update out-of-resource.md use a shorter and simpler expression. --- docs/admin/out-of-resource.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/admin/out-of-resource.md b/docs/admin/out-of-resource.md index acbc5e7a8b3e8..974454bd6dfea 100644 --- a/docs/admin/out-of-resource.md +++ b/docs/admin/out-of-resource.md @@ -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 -case that it appears 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`. From f7ad8644e9580c64ccc4d447d9dcb39c44cef45c Mon Sep 17 00:00:00 2001 From: Xin Zhang Date: Mon, 6 Mar 2017 17:10:14 +0800 Subject: [PATCH 5/5] Create a top-level CN directory to hold future md files for the Chinese kubernetes site --- cn/docs/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 cn/docs/.gitkeep diff --git a/cn/docs/.gitkeep b/cn/docs/.gitkeep new file mode 100644 index 0000000000000..e69de29bb2d1d