Skip to content

Commit fc391fa

Browse files
authored
Merge pull request #37526 from windsonsea/schevic
[zh] sync folder: /concepts/scheduling-eviction/
2 parents 423150d + 664d3d4 commit fc391fa

File tree

7 files changed

+31
-18
lines changed

7 files changed

+31
-18
lines changed

content/zh-cn/docs/concepts/scheduling-eviction/api-eviction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: API 发起的驱逐
33
content_type: concept
4-
weight: 70
4+
weight: 110
55
---
66
<!--
77
---
88
title: API-initiated Eviction
99
content_type: concept
10-
weight: 70
10+
weight: 110
1111
---
1212
-->
1313
{{< glossary_definition term_id="api-eviction" length="short" >}} </br>

content/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: 节点压力驱逐
33
content_type: concept
4-
weight: 60
4+
weight: 100
55
---
66
<!--
77
title: Node-pressure Eviction
88
content_type: concept
9-
weight: 60
9+
weight: 100
1010
-->
1111

1212
{{<glossary_definition term_id="node-pressure-eviction" length="short">}}</br>

content/zh-cn/docs/concepts/scheduling-eviction/pod-priority-preemption.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Pod 优先级和抢占
33
content_type: concept
4-
weight: 50
4+
weight: 90
55
---
66

77
<!--
@@ -10,7 +10,7 @@ reviewers:
1010
- wojtek-t
1111
title: Pod Priority and Preemption
1212
content_type: concept
13-
weight: 50
13+
weight: 90
1414
-->
1515

1616
<!-- overview -->

content/zh-cn/docs/concepts/scheduling-eviction/scheduler-perf-tuning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: 调度器性能调优
33
content_type: concept
4-
weight: 100
4+
weight: 70
55
---
66
<!--
77
---
88
reviewers:
99
- bsalamat
1010
title: Scheduler Performance Tuning
1111
content_type: concept
12-
weight: 100
12+
weight: 70
1313
---
1414
-->
1515

content/zh-cn/docs/concepts/scheduling-eviction/scheduling-framework.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 调度框架
33
content_type: concept
4-
weight: 90
4+
weight: 60
55
---
66

77
<!--
@@ -10,7 +10,7 @@ reviewers:
1010
- ahg-g
1111
title: Scheduling Framework
1212
content_type: concept
13-
weight: 90
13+
weight: 60
1414
---
1515
-->
1616

content/zh-cn/docs/concepts/scheduling-eviction/taint-and-toleration.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
---
22
title: 污点和容忍度
33
content_type: concept
4-
weight: 40
4+
weight: 50
55
---
6-
6+
<!--
7+
reviewers:
8+
- davidopp
9+
- kevin-wangzefeng
10+
- bsalamat
11+
title: Taints and Tolerations
12+
content_type: concept
13+
weight: 50
14+
-->
715

816
<!-- overview -->
917
<!--

content/zh-cn/docs/concepts/scheduling-eviction/topology-spread-constraints.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,8 @@ or more scattered.
887887

888888
`podAffinity`
889889
: attracts Pods; you can try to pack any number of Pods into qualifying
890-
topology domain(s)
890+
topology domain(s).
891+
891892
`podAntiAffinity`
892893
: repels Pods. If you set this to `requiredDuringSchedulingIgnoredDuringExecution` mode then
893894
only a single Pod can be scheduled into a single topology domain; if you choose
@@ -896,13 +897,17 @@ or more scattered.
896897
-->
897898
## 比较 podAffinity 和 podAntiAffinity {#comparison-with-podaffinity-podantiaffinity}
898899

899-
在 Kubernetes 中,Pod 间亲和性和反亲和性控制 Pod 彼此的调度方式(更密集或更分散)。
900+
在 Kubernetes 中,
901+
[Pod 间亲和性和反亲和性](/zh-cn/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity)控制
902+
Pod 彼此的调度方式(更密集或更分散)。
900903

901-
对于 `podAffinity`:吸引 Pod;你可以尝试将任意数量的 Pod 集中到符合条件的拓扑域中。
904+
`podAffinity`
905+
: 吸引 Pod;你可以尝试将任意数量的 Pod 集中到符合条件的拓扑域中。
902906

903-
对于 `podAntiAffinity`:驱逐 Pod。如果将此设为 `requiredDuringSchedulingIgnoredDuringExecution` 模式,
904-
则只有单个 Pod 可以调度到单个拓扑域;如果你选择 `preferredDuringSchedulingIgnoredDuringExecution`,
905-
则你将丢失强制执行此约束的能力。
907+
`podAntiAffinity`
908+
: 驱逐 Pod。如果将此设为 `requiredDuringSchedulingIgnoredDuringExecution` 模式,
909+
则只有单个 Pod 可以调度到单个拓扑域;如果你选择 `preferredDuringSchedulingIgnoredDuringExecution`,
910+
则你将丢失强制执行此约束的能力。
906911

907912
<!--
908913
For finer control, you can specify topology spread constraints to distribute

0 commit comments

Comments
 (0)