Skip to content

Commit 8b391b1

Browse files
authored
Merge pull request #26219 from ydFu/update-misc-batch-0124
Update Misc Batch
2 parents ca455cc + cb4cc0f commit 8b391b1

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

content/zh/docs/concepts/architecture/controller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ control loops automatically fix failures. This means that,
189189
potentially, your cluster never reaches a stable state.
190190
191191
As long as the controllers for your cluster are running and able to make
192-
useful changes, it doesn't matter if the overall state is or is not stable.
192+
useful changes, it doesn't matter if the overall state is stable or not.
193193
-->
194194
## 期望状态与当前状态 {#desired-vs-current}
195195

content/zh/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,10 @@ Monitoring agents for device plugin resources can be deployed as a daemon, or as
336336
The canonical directory `/var/lib/kubelet/pod-resources` requires privileged access, so monitoring
337337
agents must run in a privileged security context. If a device monitoring agent is running as a
338338
DaemonSet, `/var/lib/kubelet/pod-resources` must be mounted as a
339-
{{< glossary_tooltip term_id="volume" >}} in the plugin's
339+
{{< glossary_tooltip term_id="volume" >}} in the device monitoring agent's
340340
[PodSpec](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podspec-v1-core).
341-
342-
Support for the "PodResources service" requires `KubeletPodResources` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) to be enabled. It is enabled by default starting with Kubernetes 1.15.
341+
Support for the "PodResources service" requires `KubeletPodResources` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) to be enabled.
342+
It is enabled by default starting with Kubernetes 1.15 and is v1 since Kubernetes 1.20.
343343
-->
344344
gRPC 服务通过 `/var/lib/kubelet/pod-resources/kubelet.sock` 的 UNIX 套接字来提供服务。
345345
设备插件资源的监控代理程序可以部署为守护进程或者 DaemonSet。
@@ -348,11 +348,11 @@ gRPC 服务通过 `/var/lib/kubelet/pod-resources/kubelet.sock` 的 UNIX 套接
348348
如果设备监控代理以 DaemonSet 形式运行,必须要在插件的
349349
[PodSpec](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podspec-v1-core)
350350
中声明将 `/var/lib/kubelet/pod-resources` 目录以
351-
{{< glossary_tooltip text="卷" term_id="volume" >}}的形式被挂载到容器中
351+
{{< glossary_tooltip text="卷" term_id="volume" >}}的形式被挂载到设备监控代理中
352352

353353
对“PodResources 服务”的支持要求启用 `KubeletPodResources`
354354
[特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)
355-
从 Kubernetes 1.15 开始默认启用。
355+
从 Kubernetes 1.15 开始默认启用,自从 Kubernetes 1.20开始为 v1
356356

357357
<!--
358358
## Device Plugin integration with the Topology Manager

content/zh/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,15 +284,15 @@ This option is provided to the network-plugin; currently **only kubenet supports
284284
## Usage Summary
285285
286286
* `--network-plugin=cni` specifies that we use the `cni` network plugin with actual CNI plugin binaries located in `--cni-bin-dir` (default `/opt/cni/bin`) and CNI plugin configuration located in `--cni-conf-dir` (default `/etc/cni/net.d`).
287-
* `--network-plugin=kubenet` specifies that we use the `kubenet` network plugin with CNI `bridge` and `host-local` plugins placed in `/opt/cni/bin` or `cni-bin-dir`.
287+
* `--network-plugin=kubenet` specifies that we use the `kubenet` network plugin with CNI `bridge`, `lo` and `host-local` plugins placed in `/opt/cni/bin` or `cni-bin-dir`.
288288
* `--network-plugin-mtu=9001` specifies the MTU to use, currently only used by the `kubenet` network plugin.
289289
-->
290290
## 用法总结
291291

292292
* `--network-plugin=cni` 用来表明我们要使用 `cni` 网络插件,实际的 CNI 插件
293293
可执行文件位于 `--cni-bin-dir`(默认是 `/opt/cni/bin`)下, CNI 插件配置位于
294294
`--cni-conf-dir`(默认是 `/etc/cni/net.d`)下。
295-
* `--network-plugin=kubenet` 用来表明我们要使用 `kubenet` 网络插件,CNI `bridge`
295+
* `--network-plugin=kubenet` 用来表明我们要使用 `kubenet` 网络插件,CNI `bridge``lo`
296296
`host-local` 插件位于 `/opt/cni/bin``cni-bin-dir` 中。
297297
* `--network-plugin-mtu=9001` 指定了我们使用的 MTU,当前仅被 `kubenet` 网络插件使用。
298298

content/zh/docs/concepts/extend-kubernetes/operator.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ Operator.
200200
201201
You also implement an Operator (that is, a Controller) using any language / runtime
202202
that can act as a [client for the Kubernetes API](/docs/reference/using-api/client-libraries/).
203+
203204
-->
204205

205206
如果生态系统中没可以实现你目标的 Operator,你可以自己编写代码。在

content/zh/docs/home/_index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ overview:
3434
# button: "View Tutorials"
3535
# button_path: "/docs/tutorials"
3636
# - name: setup
37-
# title: "Set up a cluster"
37+
# title: "Set up a K8s cluster"
3838
# description: "Get Kubernetes running based on your resources and needs."
3939
# button: "Set up Kubernetes"
4040
# button_path: "/docs/setup"
@@ -59,7 +59,7 @@ overview:
5959
# button: Contribute to the docs
6060
# button_path: /docs/contribute
6161
# - name: release-notes
62-
# title: Release Notes
62+
# title: K8s Release Notes
6363
# description: If you are installing Kubernetes or upgrading to the newest version, refer to the current release notes.
6464
# button: "Download Kubernetes"
6565
# button_path: "/zh/docs/setup/release/notes"
@@ -78,7 +78,7 @@ cards:
7878
button: "查看教程"
7979
button_path: "/zh/docs/tutorials"
8080
- name: setup
81-
title: "设置集群"
81+
title: "设置 K8s 集群"
8282
description: "按照你的资源情况和需求运行 Kubernetes。"
8383
button: "设置 Kubernetes"
8484
button_path: "/zh/docs/setup"
@@ -103,7 +103,7 @@ cards:
103103
button: 为文档作贡献
104104
button_path: /zh/docs/contribute
105105
- name: release-notes
106-
title: 发布说明
106+
title: K8s 发布说明
107107
description: 如果你正在安装或升级 Kubernetes,最好参考最新的发布说明。
108108
button: "下载 Kubernetes"
109109
button_path: "/zh/docs/setup/release/notes"

content/zh/docs/tasks/tools/_index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ The kind [Quick Start](https://kind.sigs.k8s.io/docs/user/quick-start/) page
5555
shows you what you need to do to get up and running with `kind`.
5656
5757
<a class="btn btn-primary" href="https://kind.sigs.k8s.io/docs/user/quick-start/" role="button" aria-label="View kind Quick Start Guide">View kind Quick Start Guide</a>
58+
5859
-->
5960
## kind
6061

0 commit comments

Comments
 (0)