Merge pull request #31975 from pangqing123/main

Modify the expulsion link initiated by API
2022-03-05 04:04:52 -08:00
parent 498d9607a3 3f8ac40b0e
commit 232e38813f
7 changed files with 17 additions and 17 deletions
@@ -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/)
@@ -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/).
 -->
 {{<glossary_tooltip term_id="kubelet" text="kubelet">}}
 监控集群节点的 CPU、内存、磁盘空间和文件系统的 inode 等资源。
@@ -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/)。
 <!-- 
 The kubelet does not respect your configured `PodDisruptionBudget` or the pod's
@@ -765,14 +765,14 @@ to estimate or measure an optimal memory limit value for that container.
 ## {{% heading "whatsnext" %}}
 <!-- 
-* 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 [Pod Priority and Preemption](/docs/concepts/scheduling-eviction/pod-priority-preemption/)
 * Learn about [PodDisruptionBudgets](/docs/tasks/run-application/configure-pdb/)
 * Learn about [Quality of Service](/docs/tasks/configure-pod-container/quality-service-pod/) (QoS)
 * Check out the [Eviction API](/docs/reference/generated/kubernetes-api/{{<param "version">}}/#create-eviction-pod-v1-core)
 -->
-* 了解 [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/{{<param "version">}}/#create-eviction-pod-v1-core)
+* 查看[驱逐 API](/docs/reference/generated/kubernetes-api/{{<param "version">}}/#create-eviction-pod-v1-core)
@@ -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. 对紧俏资源的使用是否超过请求值
@@ -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/)
+* 了解[节点压力驱逐](/zh/docs/concepts/scheduling-eviction/pod-priority-preemption/)
@@ -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/)
@@ -30,9 +30,9 @@ Eviction is the process of terminating one or more Pods on Nodes.
 <!--
 There are two kinds of eviction:
 * [Node-pressure eviction](/docs/concepts/scheduling-eviction/node-pressure-eviction/)
-* [API-initiated eviction](/docs/concepts/scheduling-eviction/api-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 发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/)
+* [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/)
@@ -45,6 +45,6 @@ kubelet 监控集群节点上的 CPU、内存、磁盘空间和文件系统 inod
 kubelet 可以主动使节点上的一个或多个 Pod 失效，以回收资源并防止饥饿。
 <!-- 
-Node-pressure eviction is not the same as [API-initiated eviction](/docs/concepts/scheduling-eviction/api-eviction/).
+Node-pressure eviction is not the same as [API-initiated eviction](/docs/reference/generated/kubernetes-api/v1.23/).
 -->
-节点压力驱逐不用于 [API 发起的驱逐](/zh/docs/concepts/scheduling-eviction/api-eviction/)。
+节点压力驱逐不用于 [API 发起的驱逐](/docs/reference/generated/kubernetes-api/v1.23/)。
@@ -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` 值，