Skip to content

Commit cb7d2b2

Browse files
committed
sync liveness-readiness-startup-probes dynamic-resource-allocation install-kubeadm
Update install-kubeadm.md
1 parent 6e8b85e commit cb7d2b2

File tree

3 files changed

+32
-3
lines changed

3 files changed

+32
-3
lines changed

content/zh-cn/docs/concepts/configuration/liveness-readiness-startup-probes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ If such a probe is configured, it disables liveness and readiness checks until i
8484
如果配置了这类探针,它会禁用存活检测和就绪检测,直到启动探针成功为止。
8585

8686
<!--
87-
This type of probe is only executed at startup, unlike readiness probes, which are run periodically.
87+
This type of probe is only executed at startup, unlike liveness and readiness probes, which are run periodically.
8888
8989
* Read more about the [Configure Liveness, Readiness and Startup Probes](/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes).
9090
-->
91-
这类探针仅在启动时执行,不像就绪探针那样周期性地运行
91+
这类探针仅在启动时执行,不像存活探针和就绪探针那样周期性地运行
9292

9393
* 更多细节参阅[配置存活、就绪和启动探针](/zh-cn/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes)

content/zh-cn/docs/concepts/scheduling-eviction/dynamic-resource-allocation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ be installed. Please refer to the driver's documentation for details.
520520
521521
<!--
522522
- For more information on the design, see the
523-
[Structured Parameters with Structured Parameters](https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/4381-dra-structured-parameters)
523+
[Dynamic Resource Allocation with Structured Parameters](https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/4381-dra-structured-parameters)
524524
and the
525525
[Dynamic Resource Allocation with Control Plane Controller](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/3063-dynamic-resource-allocation/README.md) KEPs.
526526
-->

content/zh-cn/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,35 @@ documentation for the plugins about what port(s) those need.
133133
你使用的 Pod 网络插件 (详见后续章节) 也可能需要开启某些特定端口。
134134
由于各个 Pod 网络插件的功能都有所不同,请参阅他们各自文档中对端口的要求。
135135

136+
<!--
137+
## Swap configuration {#swap-configuration}
138+
139+
The default behavior of a kubelet is to fail to start if swap memory is detected on a node.
140+
This means that swap should either be disabled or tolerated by kubelet.
141+
142+
* To tolerate swap, add `failSwapOn: false` to kubelet configuration or as a command line argument.
143+
Note: even if `failSwapOn: false` is provided, workloads wouldn't have swap access by default.
144+
This can be changed by setting a `swapBehavior`, again in the kubelet configuration file. To use swap,
145+
set a `swapBehavior` other than the default `NoSwap` setting.
146+
See [Swap memory management](/docs/concepts/architecture/nodes/#swap-memory) for more details.
147+
* To disable swap, `sudo swapoff -a` can be used to disable swapping temporarily.
148+
To make this change persistent across reboots, make sure swap is disabled in
149+
config files like `/etc/fstab`, `systemd.swap`, depending how it was configured on your system.
150+
-->
151+
## 交换分区的配置 {#swap-configuration}
152+
153+
kubelet 的默认行为是在节点上检测到交换内存时无法启动。
154+
这意味着要么禁用交换(swap)功能,要么让 kubelet 容忍交换。
155+
156+
* 若需允许交换分区(swap),请在 kubelet 配置文件中添加 `failSwapOn: false`,或通过命令行参数指定。
157+
注意:即使设置了 `failSwapOn: false`,工作负载默认情况下仍无法访问交换空间。
158+
可以通过在 kubelet 配置文件中设置 `swapBehavior` 来修改此设置。若要使用交换空间,
159+
请设置 `swapBehavior` 的值,这个值不能是默认的 `NoSwap`
160+
更多细节参阅[交换内存管理](/zh-cn/docs/concepts/architecture/nodes/#swap-memory)
161+
* 要禁用交换分区(swap),可以使用命令 `sudo swapoff -a` 暂时关闭交换分区功能。
162+
要使此更改在重启后仍然生效,请确保在系统的配置文件(如 `/etc/fstab``systemd.swap`)中禁用交换功能,
163+
具体取决于你的系统配置方式。
164+
136165
<!--
137166
## Installing a container runtime {#installing-runtime}
138167

0 commit comments

Comments
 (0)