Skip to content

Commit 6d29856

Browse files
my-git9my-git9
committed
[zh-cn] sync contribute/* container-runtimes
Signed-off-by: xin.li <xin.li@daocloud.io>
1 parent b32835f commit 6d29856

File tree

6 files changed

+85
-24
lines changed

6 files changed

+85
-24
lines changed

‎content/zh-cn/docs/contribute/_index.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,10 @@ class first,second,third white
151151
<!--
152152
Figure 1. Getting started for a new contributor.
153153
154-
Figure 1 outlines a roadmap for new contributors. You can follow some or all of the steps for `Sign up` and `Review`. Now you are ready to open PRs that achieve your contribution objectives with some listed under `Open PR`. Again, questions are always welcome!
154+
Figure 1 outlines a roadmap for new contributors. You can follow some or
155+
all of the steps for `Sign up` and `Review`. Now you are ready to open PRs
156+
that achieve your contribution objectives with some listed under `Open PR`.
157+
Again, questions are always welcome!
155158
-->
156159
图 1. 新手入门指示。
157160

@@ -240,6 +243,27 @@ Figure 2. Preparation for your first contribution.
240243
- 了解[页面内容类型](/zh-cn/docs/contribute/style/page-content-types/)和
241244
[Hugo 短代码](/zh-cn/docs/contribute/style/hugo-shortcodes/)。
242245

246+
<!--
247+
## Getting help when contributing
248+
249+
Making your first contribution can be overwhelming. The
250+
[New Contributor Ambassadors](https://github.com/kubernetes/website#new-contributor-ambassadors)
251+
are there to walk you through making your first few contributions.
252+
You can reach out to them in the [Kubernetes Slack](https://slack.k8s.io/)
253+
preferably in the `#sig-docs` channel. There is also the
254+
[New Contributors Meet and Greet call](https://www.kubernetes.dev/resources/calendar/)
255+
that happens on the first Tuesday of every month. You can interact with
256+
the New Contributor Ambassadors and get your queries resolved here.
257+
-->
258+
## 贡献时获取帮助
259+
260+
做出第一个贡献可能会让人感觉比较困难。
261+
[新贡献者大使](https://github.com/kubernetes/website#new-contributor-ambassadors)
262+
将引导你完成最初的一些贡献。你可以在 [Kubernetes Slack](https://slack.k8s.io/)
263+
中联系他们，最好是在 `#sig-docs` 频道中。还有每月第一个星期二举行的
264+
[新贡献者见面会](https://www.kubernetes.dev/resources/calendar/)，
265+
你可以在此处与新贡献者大使互动并解决你的疑问。
266+
243267
<!--
244268
## Next steps
245269

‎content/zh-cn/docs/contribute/style/page-content-types.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,4 +405,3 @@ Examples of published tool reference pages are:
405405
- 了解[样式指南](/zh-cn/docs/contribute/style/style-guide/)
406406
- 了解[内容指南](/zh-cn/docs/contribute/style/content-guide/)
407407
- 了解[内容组织](/zh-cn/docs/contribute/style/content-organization/)
408-

‎content/zh-cn/docs/contribute/style/style-guide.md

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ To specify the Kubernetes version for a task or tutorial page, include
553553
[任务模板](/zh-cn/docs/contribute/style/page-content-types/#task)
554554
或[教程模板](/zh-cn/docs/contribute/style/page-content-types/#tutorial)
555555
的 `prerequisites` 小节定义 Kubernetes 版本。
556-
页面保存之后，`prerequisites` 小节会显示为 **开始之前**。
556+
页面保存之后，`prerequisites` 小节会显示为**开始之前**。
557557

558558
如果要为任务或教程页面指定 Kubernetes 版本，可以在文件的前言部分包含
559559
`min-kubernetes-server-version` 信息。
@@ -700,7 +700,7 @@ The output is:
700700

701701
使用短代码 `{{</* note */>}}` 来突出显示某种提示或者有助于读者的信息。
702702

703-
例如:
703+
例如：
704704

705705
```
706706
{{</* note */>}}
@@ -714,7 +714,7 @@ The output is:
714714
<!--
715715
You can _still_ use Markdown inside these callouts.
716716
-->
717-
在这类短代码中仍然 _可以_ 使用 Markdown 语法。
717+
在这类短代码中仍然**可以**使用 Markdown 语法。
718718
{{< /note >}}
719719

720720
<!--
@@ -1234,8 +1234,7 @@ This page teaches you how to use pods. | In this page, we are going to learn abo
12341234

12351235
### 避免使用“我们”
12361236

1237-
在句子中使用“我们”会让人感到困惑，因为读者可能不知道这里的
1238-
“我们”指的是谁。
1237+
在句子中使用“我们”会让人感到困惑，因为读者可能不知道这里的“我们”指的是谁。
12391238

12401239
{{< table caption = "要避免的模式" >}}
12411240
可以 | 不可以
@@ -1283,7 +1282,7 @@ is the [Deprecated API migration guide](/docs/reference/using-api/deprecation-gu
12831282
### 避免关于将来的陈述
12841283

12851284
要避免对将来作出承诺或暗示。如果你需要讨论的是 Alpha 功能特性，
1286-
可以将相关文字放在一个单独的标题下，标示为 Alpha 版本信息。
1285+
可以将相关文字放在一个单独的标题下，标识为 Alpha 版本信息。
12871286

12881287
此规则的一个例外是对未来版本中计划移除的已废弃功能选项的文档。
12891288
此类文档的例子之一是[已弃用 API 迁移指南](/zh-cn/docs/reference/using-api/deprecation-guide/)。
@@ -1341,6 +1340,20 @@ These steps ... | These simple steps ...
13411340
这些步骤... | 这些简单的步骤...
13421341
{{< /table >}}
13431342

1343+
<!--
1344+
### EditorConfig file
1345+
The Kubernetes project maintains an EditorConfig file that sets common style preferences in text editors
1346+
such as VS Code. You can use this file if you want to ensure that your contributions are consistent with
1347+
the rest of the project. To view the file, refer to
1348+
[`.editorconfig`](https://github.com/kubernetes/website/blob/main/.editorconfig) in the repository root.
1349+
-->
1350+
### 编辑器配置文件
1351+
1352+
Kubernetes 项目维护一个 EditorConfig 文件，用于设置文本编辑器（例如 VS Code）中的常见样式首选项。
1353+
如果你想确保你的贡献与项目的其余部分样式保持一致，则可以使用此文件。
1354+
要查看该文件，请参阅项目仓库根目录的
1355+
[`.editorconfig`](https://github.com/kubernetes/website/blob/main/.editorconfig)。
1356+
13441357
## {{% heading "whatsnext" %}}
13451358

13461359
<!--

‎content/zh-cn/docs/contribute/style/write-new-topic.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ the topic. In your topic file, use the `codenew` shortcode:
231231
其中 `<LANG>` 是该主题的语言。在主题文件中使用 `codenew` 短代码：
232232

233233
```none
234-
{{</* codenew file="<RELPATH>/my-example-yaml>" */>}}
234+
{{%/* codenew file="<RELPATH>/my-example-yaml>" */%}}
235235
```
236236

237237
<!--
@@ -245,19 +245,9 @@ file located at `/content/en/examples/pods/storage/gce-volume.yaml`.
245245
文件。
246246

247247
```none
248-
{{</* codenew file="pods/storage/gce-volume.yaml" */>}}
248+
{{%/* codenew file="pods/storage/gce-volume.yaml" */%}}
249249
```
250250

251-
<!--
252-
To show raw Hugo shortcodes as in the above example and prevent Hugo
253-
from interpreting them, use C-style comments directly after the `<` and before
254-
the `>` characters. View the code for this page for an example.
255-
-->
256-
{{< note >}}
257-
要展示上述示例中的原始 Hugo 短代码并避免 Hugo 对其进行解释，
258-
请直接在 `<` 字符之后和 `>` 字符之前使用 C 样式注释。请查看此页面的代码。
259-
{{< /note >}}
260-
261251
<!--
262252
## Showing how to create an API object from a configuration file
263253

‎content/zh-cn/docs/contribute/suggesting-improvements.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,29 @@ content_type: concept
44
weight: 10
55
card:
66
name: contribute
7-
weight: 20
7+
weight: 15
8+
anchors:
9+
- anchor: "#opening-an-issue"
10+
title: 提出内容改进建议
811
---
912
<!--
1013
title: Suggesting content improvements
1114
content_type: concept
1215
weight: 10
1316
card:
1417
name: contribute
15-
weight: 20
18+
weight: 15
19+
anchors:
20+
- anchor: "#opening-an-issue"
21+
title: Suggest content improvements
1622
-->
1723

1824
<!-- overview -->
1925

2026
<!--
21-
If you notice an issue with Kubernetes documentation or have an idea for new content, then open an issue. All you need is a [GitHub account](https://github.com/join) and a web browser.
27+
If you notice an issue with Kubernetes documentation or have an idea for new content,
28+
then open an issue. All you need is a [GitHub account](https://github.com/join) and
29+
a web browser.
2230
2331
In most cases, new work on Kubernetes documentation begins with an issue in GitHub. Kubernetes contributors
2432
then review, categorize and tag issues as needed. Next, you or another member
@@ -115,4 +123,3 @@ fellow contributors. For example, "The docs are terrible" is not
115123
例如：`Introduced by #987654`。
116124
- 遵从[行为准则](/zh-cn/community/code-of-conduct/)。尊重同行贡献者。
117125
例如，"The docs are terrible" 就是无用且无礼的反馈。
118-

‎content/zh-cn/docs/setup/production-environment/container-runtimes.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,18 @@ the `cgroupDriver` field under `KubeletConfiguration`, kubeadm defaults it to `s
261261
`KubeletConfiguration` 下设置 `cgroupDriver` 字段，kubeadm 默认使用 `systemd`。
262262
{{< /note >}}
263263

264+
<!--
265+
In Kubernetes v1.28, with the `KubeletCgroupDriverFromCRI`
266+
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
267+
enabled and a container runtime that supports the `RuntimeConfig` CRI RPC,
268+
the kubelet automatically detects the appropriate cgroup driver from the runtime,
269+
and ignores the `cgroupDriver` setting within the kubelet configuration.
270+
-->
271+
在 Kubernetes v1.28 中，启用 `KubeletCgroupDriverFromCRI`
272+
[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)结合支持
273+
`RuntimeConfig` CRI RPC 的容器运行时，kubelet 会自动从运行时检测适当的 Cgroup
274+
驱动程序，并忽略 kubelet 配置中的 `cgroupDriver` 设置。
275+
264276
<!--
265277
If you configure `systemd` as the cgroup driver for the kubelet, you must also
266278
configure `systemd` as the cgroup driver for the container runtime. Refer to
@@ -437,6 +449,14 @@ When using kubeadm, manually configure the
437449
当使用 kubeadm 时，请手动配置
438450
[kubelet 的 cgroup 驱动](/zh-cn/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver/#configuring-the-kubelet-cgroup-driver)。
439451

452+
<!--
453+
In Kubernetes v1.28, you can enable automatic detection of the
454+
cgroup driver as an alpha feature. See [systemd cgroup driver](#systemd-cgroup-driver)
455+
for more details.
456+
-->
457+
在 Kubernetes v1.28 中，你可以启用 Cgroup 驱动程序的自动检测的 Alpha 级别特性。
458+
详情参阅 [systemd cgroup 驱动](#systemd-cgroup-driver)。
459+
440460
<!--
441461
#### Overriding the sandbox (pause) image {#override-pause-image-containerd}
442462
@@ -509,6 +529,14 @@ in sync.
509529
你还应该注意当使用 CRI-O 时，并且 CRI-O 的 cgroup 设置为 `cgroupfs` 时，必须将 `conmon_cgroup` 设置为值 `pod`。
510530
通常需要保持 kubelet 的 cgroup 驱动配置（通常通过 kubeadm 完成）和 CRI-O 同步。
511531

532+
<!--
533+
In Kubernetes v1.28, you can enable automatic detection of the
534+
cgroup driver as an alpha feature. See [systemd cgroup driver](#systemd-cgroup-driver)
535+
for more details.
536+
-->
537+
在 Kubernetes v1.28 中，你可以启用 Cgroup 驱动程序的自动检测的 Alpha 级别特性。
538+
详情参阅 [systemd cgroup 驱动](#systemd-cgroup-driver)。
539+
512540
<!--
513541
For CRI-O, the CRI socket is `/var/run/crio/crio.sock` by default.
514542
-->

0 commit comments

Comments
 (0)