From bff6d62c450d77ae5cd379c647a44e09d39c7594 Mon Sep 17 00:00:00 2001 From: pangqing Date: Mon, 28 Feb 2022 23:03:51 +0800 Subject: [PATCH 1/3] Modify the expulsion link initiated by API Signed-off-by: pangqing --- .../scheduling-eviction/node-pressure-eviction.md | 8 ++++---- .../scheduling-eviction/pod-priority-preemption.md | 4 ++-- content/zh/docs/reference/glossary/eviction.md | 4 ++-- .../zh/docs/reference/glossary/node-pressure-eviction.md | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md b/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md index 4c40fac8b0..906b604a0a 100644 --- a/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md +++ b/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md @@ -31,7 +31,7 @@ kubelet 可以主动地使节点上一个或者多个 Pod 失效，以回收资 在节点压力驱逐期间，kubelet 将所选 Pod 的 `PodPhase` 设置为 `Failed`。这将终止 Pod。 -节点压力驱逐不同于 [API 发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/)。 +节点压力驱逐不同于 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/)。 -* 了解 [API 发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/) +* 了解 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/) * 了解 [Pod 优先级和驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) * 了解 [PodDisruptionBudgets](/docs/tasks/run-application/configure-pdb/) * 了解[服务质量](/zh/docs/tasks/configure-pod-container/quality-service-pod/)（QoS） -* 查看[驱逐 API](/docs/reference/generated/kubernetes-api/{{}}/#create-eviction-pod-v1-core) \ No newline at end of file +* 查看[驱逐 API](/docs/reference/generated/kubernetes-api/{{}}/#create-eviction-pod-v1-core) diff --git a/content/zh/docs/concepts/scheduling-eviction/pod-priority-preemption.md b/content/zh/docs/concepts/scheduling-eviction/pod-priority-preemption.md index 33cf14c540..370fd2bbbb 100644 --- a/content/zh/docs/concepts/scheduling-eviction/pod-priority-preemption.md +++ b/content/zh/docs/concepts/scheduling-eviction/pod-priority-preemption.md @@ -657,11 +657,11 @@ kubelet 使用优先级来确定 * Read about using ResourceQuotas in connection with PriorityClasses: [limit Priority Class consumption by default](/docs/concepts/policy/resource-quotas/#limit-priority-class-consumption-by-default) * Learn about [Pod Disruption](/docs/concepts/workloads/pods/disruptions/) -* Learn about [API-initiated Eviction](/docs/concepts/scheduling-eviction/api-eviction/) +* Learn about [API-initiated Eviction](/docs/reference/generated/kubernetes-api/v1.23/) * Learn about [Node-pressure Eviction](/docs/concepts/scheduling-eviction/node-pressure-eviction/) --> * 阅读有关将 ResourceQuota 与 PriorityClass 结合使用的信息： [默认限制优先级消费](/zh/docs/concepts/policy/resource-quotas/#limit-priority-class-consumption-by-default) * 了解 [Pod 干扰](/zh/docs/concepts/workloads/pods/disruptions/) -* 了解 [API 发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/) +* 了解 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/) * 了解[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/node-pressure-eviction/) diff --git a/content/zh/docs/reference/glossary/eviction.md b/content/zh/docs/reference/glossary/eviction.md index a77fdcfd05..9bdf5049f3 100644 --- a/content/zh/docs/reference/glossary/eviction.md +++ b/content/zh/docs/reference/glossary/eviction.md @@ -30,9 +30,9 @@ Eviction is the process of terminating one or more Pods on Nodes. 驱逐的两种类型 * [节点压力驱逐](/zh/docs/concepts/scheduling-eviction/node-pressure-eviction/) -* [API 发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/) +* [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/) diff --git a/content/zh/docs/reference/glossary/node-pressure-eviction.md b/content/zh/docs/reference/glossary/node-pressure-eviction.md index d1336d57d2..c5faa5f135 100644 --- a/content/zh/docs/reference/glossary/node-pressure-eviction.md +++ b/content/zh/docs/reference/glossary/node-pressure-eviction.md @@ -45,6 +45,6 @@ kubelet 监控集群节点上的 CPU、内存、磁盘空间和文件系统 inod kubelet 可以主动使节点上的一个或多个 Pod 失效，以回收资源并防止饥饿。 -节点压力驱逐不用于 [API 发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/)。 +节点压力驱逐不用于 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/)。 From cdde38b85aeb9d4cf158912d11d0fc4259711630 Mon Sep 17 00:00:00 2001 From: pangqing Date: Tue, 1 Mar 2022 10:50:32 +0800 Subject: [PATCH 2/3] Modify node pressure expulsion link Signed-off-by: pangqing --- .../concepts/scheduling-eviction/_index.md | 2 +- .../pod-priority-preemption.md | 4 +- .../taint-and-toleration.md | 2 +- .../zh/docs/reference/glossary/eviction.md | 2 +- .../reserve-compute-resources.md | 2 +- ！ | 53 +++++++++++++++++++ 6 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 ！ diff --git a/content/zh/docs/concepts/scheduling-eviction/_index.md b/content/zh/docs/concepts/scheduling-eviction/_index.md index 01265f3a05..81274d27aa 100644 --- a/content/zh/docs/concepts/scheduling-eviction/_index.md +++ b/content/zh/docs/concepts/scheduling-eviction/_index.md @@ -49,5 +49,5 @@ of terminating one or more Pods on Nodes. ## Pod 干扰 * [Pod 优先级和抢占](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) -* [节点压力驱逐](/zh/docs/concepts/scheduling-eviction/node-pressure-eviction/) +* [节点压力驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) * [API发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/) diff --git a/content/zh/docs/concepts/scheduling-eviction/pod-priority-preemption.md b/content/zh/docs/concepts/scheduling-eviction/pod-priority-preemption.md index 370fd2bbbb..cf4db83684 100644 --- a/content/zh/docs/concepts/scheduling-eviction/pod-priority-preemption.md +++ b/content/zh/docs/concepts/scheduling-eviction/pod-priority-preemption.md @@ -637,7 +637,7 @@ exceeding its requests, it won't be evicted. Another Pod with higher priority that exceeds its requests may be evicted. --> kubelet 使用优先级来确定 -[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/node-pressure-eviction/) Pod 的顺序。 +[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) Pod 的顺序。 你可以使用 QoS 类来估计 Pod 最有可能被驱逐的顺序。kubelet 根据以下因素对 Pod 进行驱逐排名： 1. 对紧俏资源的使用是否超过请求值 @@ -664,4 +664,4 @@ kubelet 使用优先级来确定 [默认限制优先级消费](/zh/docs/concepts/policy/resource-quotas/#limit-priority-class-consumption-by-default) * 了解 [Pod 干扰](/zh/docs/concepts/workloads/pods/disruptions/) * 了解 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/) -* 了解[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/node-pressure-eviction/) +* 了解[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) diff --git a/content/zh/docs/concepts/scheduling-eviction/taint-and-toleration.md b/content/zh/docs/concepts/scheduling-eviction/taint-and-toleration.md index 9b374d2f87..d1d400217c 100644 --- a/content/zh/docs/concepts/scheduling-eviction/taint-and-toleration.md +++ b/content/zh/docs/concepts/scheduling-eviction/taint-and-toleration.md @@ -545,5 +545,5 @@ arbitrary tolerations to DaemonSets. * Read about [Node-pressure Eviction](/docs/concepts/scheduling-eviction/node-pressure-eviction/) and how you can configure it * Read about [Pod Priority](/docs/concepts/scheduling-eviction/pod-priority-preemption/) --> -* 阅读[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/node-pressure-eviction/)，以及如何配置其行为 +* 阅读[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/)，以及如何配置其行为 * 阅读 [Pod 优先级](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) diff --git a/content/zh/docs/reference/glossary/eviction.md b/content/zh/docs/reference/glossary/eviction.md index 9bdf5049f3..30666ca2b1 100644 --- a/content/zh/docs/reference/glossary/eviction.md +++ b/content/zh/docs/reference/glossary/eviction.md @@ -33,6 +33,6 @@ There are two kinds of eviction: * [API-initiated eviction](/docs/reference/generated/kubernetes-api/v1.23/) --> 驱逐的两种类型 -* [节点压力驱逐](/zh/docs/concepts/scheduling-eviction/node-pressure-eviction/) +* [节点压力驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) * [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/) diff --git a/content/zh/docs/tasks/administer-cluster/reserve-compute-resources.md b/content/zh/docs/tasks/administer-cluster/reserve-compute-resources.md index e0b2d8a6e8..251de2231e 100644 --- a/content/zh/docs/tasks/administer-cluster/reserve-compute-resources.md +++ b/content/zh/docs/tasks/administer-cluster/reserve-compute-resources.md @@ -340,7 +340,7 @@ respectively. `kubelet` 默认对 Pod 执行 'Allocatable' 约束。 无论何时，如果所有 Pod 的总用量超过了 'Allocatable'，驱逐 Pod 的措施将被执行。 有关驱逐策略的更多细节可以在 -[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/node-pressure-eviction/)页找到。 +[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/)页找到。 可通过设置 kubelet `--enforce-node-allocatable` 标志值为 `pods` 控制这个措施。 可选地，通过在同一标志中同时指定 `kube-reserved` 和 `system-reserved` 值， diff --git a/！ b/！ new file mode 100644 index 0000000000..81274d27aa --- /dev/null +++ b/！ @@ -0,0 +1,53 @@ +--- +title: 调度，抢占和驱逐 +weight: 90 +content_type: concept +description: > + 在Kubernetes中，调度 (scheduling) 指的是确保 Pods 匹配到合适的节点， + 以便 kubelet 能够运行它们。抢占 (Preemption) 指的是终止低优先级的 Pods 以便高优先级的 Pods 可以 + 调度运行的过程。驱逐 (Eviction) 是在资源匮乏的节点上，主动让一个或多个 Pods 失效的过程。 +--- + + + + + + + +## 调度 + +* [Kubernetes 调度器](/zh/docs/concepts/scheduling-eviction/kube-scheduler/) +* [将 Pods 指派到节点](/zh/docs/concepts/scheduling-eviction/assign-pod-node/) +* [Pod 开销](/zh/docs/concepts/scheduling-eviction/pod-overhead/) +* [污点和容忍](/zh/docs/concepts/scheduling-eviction/taint-and-toleration/) +* [调度框架](/zh/docs/concepts/scheduling-eviction/scheduling-framework) +* [调度器的性能调试](/zh/docs/concepts/scheduling-eviction/scheduler-perf-tuning/) +* [扩展资源的资源装箱](/zh/docs/concepts/scheduling-eviction/resource-bin-packing/) + + + +## Pod 干扰 + +* [Pod 优先级和抢占](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) +* [节点压力驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) +* [API发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/) From 3f8ac40b0e1a74778caa2ad1909b0a83174b08c1 Mon Sep 17 00:00:00 2001 From: pangqing Date: Fri, 4 Mar 2022 13:40:33 +0800 Subject: [PATCH 3/3] Modify the expulsion link initiated by API Signed-off-by: pangqing --- .../node-pressure-eviction.md | 2 +- ！ | 53 ------------------- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 ！ diff --git a/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md b/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md index 906b604a0a..fcecf74a10 100644 --- a/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md +++ b/content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md @@ -22,7 +22,7 @@ During a node-pressure eviction, the kubelet sets the `PodPhase` for the selected pods to `Failed`. This terminates the pods. Node-pressure eviction is not the same as -[API-initiated eviction](/docs/concepts/scheduling-eviction/api-eviction/). +[API-initiated eviction](/docs/reference/generated/kubernetes-api/v1.23/). --> {{}} 监控集群节点的 CPU、内存、磁盘空间和文件系统的 inode 等资源。 diff --git a/！ b/！ deleted file mode 100644 index 81274d27aa..0000000000 --- a/！ +++ /dev/null @@ -1,53 +0,0 @@ ---- -title: 调度，抢占和驱逐 -weight: 90 -content_type: concept -description: > - 在Kubernetes中，调度 (scheduling) 指的是确保 Pods 匹配到合适的节点， - 以便 kubelet 能够运行它们。抢占 (Preemption) 指的是终止低优先级的 Pods 以便高优先级的 Pods 可以 - 调度运行的过程。驱逐 (Eviction) 是在资源匮乏的节点上，主动让一个或多个 Pods 失效的过程。 ---- - - - - - - - -## 调度 - -* [Kubernetes 调度器](/zh/docs/concepts/scheduling-eviction/kube-scheduler/) -* [将 Pods 指派到节点](/zh/docs/concepts/scheduling-eviction/assign-pod-node/) -* [Pod 开销](/zh/docs/concepts/scheduling-eviction/pod-overhead/) -* [污点和容忍](/zh/docs/concepts/scheduling-eviction/taint-and-toleration/) -* [调度框架](/zh/docs/concepts/scheduling-eviction/scheduling-framework) -* [调度器的性能调试](/zh/docs/concepts/scheduling-eviction/scheduler-perf-tuning/) -* [扩展资源的资源装箱](/zh/docs/concepts/scheduling-eviction/resource-bin-packing/) - - - -## Pod 干扰 - -* [Pod 优先级和抢占](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) -* [节点压力驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/) -* [API发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/)