Skip to content

Commit d5aecbf

Browse files
authored
Merge pull request #43994 from my-git9/contribute-329
[zh-cn] sync issue-wrangler open-a-pr feature-gates diagram-guide
2 parents e4f8dab + 0c80ff1 commit d5aecbf

File tree

4 files changed

+69
-36
lines changed

4 files changed

+69
-36
lines changed

content/zh-cn/docs/contribute/new-content/open-a-pr.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ flowchart LR
231231
subgraph changes[你的变更]
232232
direction TB
233233
S[ ] -.-
234-
3[创建一个分支<br>例如: my_new_branch] --> 3a[使用文本编辑器<br>进行修改] --> 4["使用 Hugo 在本地<br>预览你的变更<br>(localhost:1313)<br>或构建容器镜像"]
234+
3[创建一个分支<br>例如my_new_branch] --> 3a[使用文本编辑器<br>进行修改] --> 4["使用 Hugo 在本地<br>预览你的变更<br>(localhost:1313)<br>或构建容器镜像"]
235235
end
236236
subgraph changes2[提交 / 推送]
237237
direction TB
@@ -592,11 +592,15 @@ Alternately, install and use the `hugo` command on your computer:
592592
### 从你的克隆副本向 kubernetes/website 发起拉取请求(PR) {#open-a-pr}
593593

594594
<!--
595-
Figure 3 shows the steps to open a PR from your fork to the kubernetes/website. The details follow.
595+
Figure 3 shows the steps to open a PR from your fork to the [kubernetes/website](https://github.com/kubernetes/website). The details follow.
596+
597+
Please, note that contributors can mention `kubernetes/website` as `k/website`.
596598
-->
597599
图 3 显示了从你的克隆副本向 kubernetes/website 发起 PR 的步骤。
598600
详细信息如下。
599601

602+
请注意,贡献者可以将 `kubernetes/website` 称为 `k/website`
603+
600604
<!-- See https://github.com/kubernetes/website/issues/28808 for live-editor URL to this figure -->
601605
<!-- You can also cut/paste the mermaid code into the live editor at https://mermaid-js.github.io/mermaid-live-editor to play around with it -->
602606

@@ -1055,4 +1059,3 @@ possible when you file issues or PRs.
10551059
- Read [Reviewing](/docs/contribute/review/reviewing-prs) to learn more about the review process.
10561060
-->
10571061
- 阅读[评阅](/zh-cn/docs/contribute/review/reviewing-prs)节,学习评阅过程。
1058-

content/zh-cn/docs/contribute/participate/issue-wrangler.md

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ weight: 20
1212
<!-- overview -->
1313

1414
<!--
15-
Alongside the [PR Wrangler](/docs/contribute/participate/pr-wranglers),formal approvers, and reviewers, members of SIG Docs take week long shifts [triaging and categorising issues](/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues) for the repository.
15+
Alongside the [PR Wrangler](/docs/contribute/participate/pr-wranglers),formal approvers,
16+
and reviewers, members of SIG Docs take week long shifts
17+
[triaging and categorising issues](/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues)
18+
for the repository.
1619
-->
1720
除了承担 [PR 管理者](/zh-cn/docs/contribute/participate/pr-wranglers)的职责外,
1821
SIG Docs 正式的批准人(Approver)、评审人(Reviewer)和成员(Member)
@@ -25,7 +28,9 @@ SIG Docs 正式的批准人(Approver)、评审人(Reviewer)和成员(M
2528
2629
Each day in a week-long shift the Issue Wrangler will be responsible for:
2730
28-
- Triaging and tagging incoming issues daily. See [Triage and categorize issues](https://github.com/kubernetes/website/blob/main/content/en/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues) for guidelines on how SIG Docs uses metadata.
31+
- Triaging and tagging incoming issues daily. See
32+
[Triage and categorize issues](/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues)
33+
for guidelines on how SIG Docs uses metadata.
2934
- Keeping an eye on stale & rotten issues within the kubernetes/website repository.
3035
- Maintenance of the [Issues board](https://github.com/orgs/kubernetes/projects/72/views/1).
3136
-->
@@ -34,18 +39,19 @@ Each day in a week-long shift the Issue Wrangler will be responsible for:
3439
在为期一周的轮值期内,Issue 管理者每天负责:
3540

3641
- 对收到的 Issue 进行日常分类和标记。有关 SIG Docs 如何使用元数据的指导说明,
37-
参阅[归类 Issue](https://github.com/kubernetes/website/blob/main/content/en/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues)
42+
参阅[归类 Issue](/zh-cn/docs/contribute/review/for-approvers.md/#triage-and-categorize-issues)
3843
- 密切关注 kubernetes/website 代码仓库中陈旧和过期的 Issue。
3944
- 维护 [Issues 看板](https://github.com/orgs/kubernetes/projects/72/views/1)
4045

4146
<!--
42-
### Requirements
47+
## Requirements
4348
4449
- Must be an active member of the Kubernetes organization.
45-
- A minimum of 15 [non-trivial](https://www.kubernetes.dev/docs/guide/pull-requests/#trivial-edits) contributions to Kubernetes (of which a certain amount should be directed towards kubernetes/website).
46-
- Performing the role in an informal capacity already
50+
- A minimum of 15 [non-trivial](https://www.kubernetes.dev/docs/guide/pull-requests/#trivial-edits)
51+
contributions to Kubernetes (of which a certain amount should be directed towards kubernetes/website).
52+
- Performing the role in an informal capacity already.
4753
-->
48-
### 要求 {#requirements}
54+
## 要求 {#requirements}
4955

5056
- 必须是 Kubernetes 组织的活跃成员。
5157
- 至少为 Kubernetes 做了 15
@@ -54,12 +60,16 @@ Each day in a week-long shift the Issue Wrangler will be responsible for:
5460
- 已经以非正式身份履行该职责。
5561

5662
<!--
57-
### Helpful [Prow commands](https://prow.k8s.io/command-help) for wranglers
63+
## Helpful Prow commands for wranglers
64+
65+
Below are some commonly used commands for Issue Wranglers:
5866
-->
59-
### 对管理者有帮助的 [Prow 命令](https://prow.k8s.io/command-help)
67+
## 对管理者有帮助的 Prow 命令
68+
69+
以下是 Issue 管理者的一些常用命令:
6070

6171
<!--
62-
```
72+
```bash
6373
# reopen an issue
6474
/reopen
6575
@@ -94,7 +104,7 @@ Each day in a week-long shift the Issue Wrangler will be responsible for:
94104
/close not-planned
95105
```
96106
-->
97-
```
107+
```bash
98108
# 重新打开 Issue
99109
/reopen
100110

@@ -130,19 +140,27 @@ Each day in a week-long shift the Issue Wrangler will be responsible for:
130140
```
131141

132142
<!--
133-
### When to close Issues
143+
To find more Prow commands, refer to the [Command Help](https://prow.k8s.io/command-help) documentation.
144+
-->
145+
要查找更多 Prow 命令,请参阅[命令帮助](https://prow.k8s.io/command-help)文档。
146+
147+
<!--
148+
## When to close Issues
134149
135-
For an open source project to succeed, good issue management is crucial. But it is also critical to resolve issues in order to maintain the repository and communicate clearly with contributors and users.
150+
For an open source project to succeed, good issue management is crucial.
151+
But it is also critical to resolve issues in order to maintain the repository
152+
and communicate clearly with contributors and users.
136153
-->
137-
### 何时关闭 Issue {#when-to-close-issues}
154+
## 何时关闭 Issue {#when-to-close-issues}
138155

139156
一个开源项目想要成功,良好的 Issue 管理非常关键。
140157
但解决 Issue 也很重要,这样才能维护代码仓库,并与贡献者和用户进行清晰明确的交流。
141158

142159
<!--
143160
Close issues when:
144161
145-
- A similar issue is reported more than once.You will first need to tag it as /triage duplicate; link it to the main issue & then close it. It is also advisable to direct the users to the original issue.
162+
- A similar issue is reported more than once.You will first need to tag it as `/triage duplicate`;
163+
link it to the main issue & then close it. It is also advisable to direct the users to the original issue.
146164
- It is very difficult to understand and address the issue presented by the author with the information provided.
147165
However, encourage the user to provide more details or reopen the issue if they can reproduce it later.
148166
- The same functionality is implemented elsewhere. One can close this issue and direct user to the appropriate place.
@@ -152,7 +170,7 @@ Close issues when:
152170
-->
153171
关闭 Issue 的时机包括:
154172

155-
- 类似的 Issue 被多次报告。你首先需要将其标记为 /triage duplicate;
173+
- 类似的 Issue 被多次报告。你首先需要将其标记为 `/triage duplicate`
156174
将其链接到主要 Issue 然后关闭它。还建议将用户引导至最初的 Issue。
157175
- 通过所提供的信息很难理解和解决作者提出的 Issue。
158176
但要鼓励用户提供更多细节,或者在以后可以重现 Issue 时重新打开此 Issue 。

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,11 +420,15 @@ and Netlify previews to verify the diagram is properly rendered.
420420

421421
{{< caution >}}
422422
<!--
423-
The Mermaid live editor feature set may not support the kubernetes/website Mermaid feature set.
423+
The Mermaid live editor feature set may not support the [kubernetes/website](https://github.com/kubernetes/website) Mermaid feature set.
424+
And please, note that contributors can mention `kubernetes/website` as `k/website`.
424425
You might see a syntax error or a blank screen after the Hugo build.
425426
If that is the case, consider using the Mermaid+SVG method.
426427
-->
427-
Mermaid 在线编辑器的功能特性可能不支持 K8s 网站的 Mermaid 特性。
428+
Mermaid 在线编辑器的功能特性可能不支持
429+
[kubernetes/website](https://github.com/kubernetes/website)
430+
的 Mermaid 特性。
431+
请注意,贡献者可以将 `kubernetes/website` 称为 `k/website`
428432
你可能在 Hugo 构建过程中看到语法错误提示或者空白屏幕。
429433
如果发生这类情况,可以考虑使用 Mermaid+SVG 方法。
430434
{{< /caution >}}
@@ -548,14 +552,15 @@ The following lists advantages of the Mermaid+SVG method:
548552
549553
* Live editor tool.
550554
* Live editor tool supports the most current Mermaid feature set.
551-
* Employ existing kubernetes/website methods for handling `.svg` image files.
555+
* Employ existing [kubernetes/website](https://github.com/kubernetes/website) methods for handling `.svg` image files.
552556
* Environment doesn't require Mermaid support.
553557
-->
554558
使用 Mermaid+SVG 方法的好处有:
555559

556560
* 可以直接使用在线编辑器工具
557561
* 在线编辑器支持的 Mermaid 特性集合最新
558-
* 可以利用 K8s 网站用来处理 `.svg` 图片文件的现有方法
562+
* 可以利用 [kubernetes/website](https://github.com/kubernetes/website)
563+
用来处理 `.svg` 图片文件的现有方法
559564
* 工作环境不需要 Mermaid 支持
560565

561566
<!--

content/zh-cn/docs/reference/command-line-tools-reference/feature-gates.md

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ For a reference to old feature gates that are removed, please refer to
397397
A feature can be in *Alpha*, *Beta* or *GA* stage.
398398
An *Alpha* feature means:
399399
-->
400-
处于 **Alpha** **Beta****GA** 阶段的特性。
400+
处于 **Alpha****Beta****GA** 阶段的特性。
401401

402402
**Alpha** 特性代表:
403403

@@ -454,7 +454,7 @@ After they exit beta, it may not be practical for us to make more changes.
454454
<!--
455455
A *General Availability* (GA) feature is also referred to as a *stable* feature. It means:
456456
-->
457-
**General Availability** (GA) 特性也称为 **稳定** 特性,**GA** 特性代表着:
457+
**General Availability**(GA)特性也称为**稳定**特性,**GA** 特性代表着:
458458

459459
<!--
460460
* The feature is always enabled; you cannot disable it.
@@ -479,7 +479,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
479479
- `AdmissionWebhookMatchConditions`: Enable [match conditions](/docs/reference/access-authn-authz/extensible-admission-controllers/#matching-requests-matchconditions)
480480
on mutating & validating admission webhooks.
481481
-->
482-
- `AdmissionWebhookMatchConditions`: 在转换和验证准入 Webhook
482+
- `AdmissionWebhookMatchConditions`在转换和验证准入 Webhook
483483
上启用[匹配条件](/zh-cn/docs/reference/access-authn-authz/extensible-admission-controllers/#matching-requests-matchconditions)
484484
<!--
485485
- `APIListChunking`: Enable the API clients to retrieve (`LIST` or `GET`)
@@ -623,7 +623,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
623623
on behalf of a CronJob.
624624
- `CronJobTimeZone`: Allow the use of the `timeZone` optional field in [CronJobs](/docs/concepts/workloads/controllers/cron-jobs/).
625625
-->
626-
- `ComponentSLIs`: 在 kubelet、kube-scheduler、kube-proxy、kube-controller-manager、cloud-controller-manager
626+
- `ComponentSLIs`在 kubelet、kube-scheduler、kube-proxy、kube-controller-manager、cloud-controller-manager
627627
等 Kubernetes 组件上启用 `/metrics/slis` 端点,从而允许你抓取健康检查指标。
628628
- `ConsistentHTTPGetHandlers`:使用探测器为生命周期处理程序规范化 HTTP get URL 和标头传递。
629629
- `ConsistentListFromCache`:允许 API 服务器从缓存中提供一致的列表。
@@ -1132,7 +1132,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
11321132
允许 kube-proxy 来处理终止过程中的端点。
11331133
- `QOSReserved`:允许在 QoS 级别进行资源预留,以防止处于较低 QoS 级别的 Pod
11341134
突发进入处于较高 QoS 级别的请求资源(目前仅适用于内存)。
1135-
- `ReadWriteOncePod`: 允许使用 `ReadWriteOncePod` 访问模式的 PersistentVolume。
1135+
- `ReadWriteOncePod`允许使用 `ReadWriteOncePod` 访问模式的 PersistentVolume。
11361136
<!--
11371137
- `RecoverVolumeExpansionFailure`: Enables users to edit their PVCs to smaller
11381138
sizes so as they can recover from previously issued volume expansion failures.
@@ -1196,16 +1196,23 @@ Each feature gate is designed for enabling/disabling a specific feature:
11961196
-->
11971197
- `SeccompDefault`:启用 `RuntimeDefault` 作为所有工作负载的默认 seccomp 配置文件。
11981198
此 seccomp 配置文件在 Pod 和/或 Container 的 `securityContext` 中被指定。
1199-
- `SecurityContextDeny`: 此门控表示 `SecurityContextDeny` 准入控制器已弃用。
1199+
- `SecurityContextDeny`此门控表示 `SecurityContextDeny` 准入控制器已弃用。
12001200
- `ServerSideApply`:在 API 服务器上启用[服务器端应用(SSA)](/zh-cn/docs/reference/using-api/server-side-apply/)
12011201
- `ServerSideFieldValidation`:启用服务器端字段验证。
12021202
这意味着验证资源模式在 API 服务器端而不是客户端执行
12031203
(例如,`kubectl create``kubectl apply` 命令行)。
12041204
<!--
1205+
- `ServiceNodePortStaticSubrange`: Enables the use of different port allocation
1206+
strategies for NodePort Services. For more details, see
1207+
[reserve NodePort ranges to avoid collisions](/docs/concepts/services-networking/service/#avoid-nodeport-collisions).
1208+
-->
1209+
- `ServiceNodePortStaticSubrange`:允许对 NodePort Service
1210+
使用不同的端口分配策略。有关更多详细信息,
1211+
请参阅[保留 NodePort 范围以避免冲突](/zh-cn/docs/concepts/services-networking/service/#avoid-nodeport-collisions)
1212+
<!--
12051213
- `SidecarContainers`: Allow setting the `restartPolicy` of an init container to
12061214
`Always` so that the container becomes a sidecar container (restartable init containers).
1207-
See
1208-
[Sidecar containers and restartPolicy](/docs/concepts/workloads/pods/init-containers/#sidecar-containers-and-restartpolicy)
1215+
See [Sidecar containers and restartPolicy](/docs/concepts/workloads/pods/init-containers/#sidecar-containers-and-restartpolicy)
12091216
for more details.
12101217
-->
12111218
- `SidecarContainers`:允许将 Init 容器的 `restartPolicy` 设置为 `Always`
@@ -1225,7 +1232,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
12251232
-->
12261233
- `SizeMemoryBackedVolumes`:允许 kubelet 检查基于内存制备的卷的尺寸约束(目前主要针对 `emptyDir` 卷)。
12271234
- `SkipReadOnlyValidationGCE`:跳过对 GCE 的验证,将在下个版本中启用。
1228-
- `StableLoadBalancerNodeSet`: 允许服务控制器(KCCM)根据节点状态变化来减少负载均衡器的重新配置。
1235+
- `StableLoadBalancerNodeSet`允许服务控制器(KCCM)根据节点状态变化来减少负载均衡器的重新配置。
12291236
- `StatefulSetStartOrdinal`:允许在 StatefulSet 中配置起始序号。
12301237
更多细节请参阅[起始序号](/zh-cn/docs/concepts/workloads/controllers/statefulset/#start-ordinal)
12311238
<!--
@@ -1258,10 +1265,10 @@ Each feature gate is designed for enabling/disabling a specific feature:
12581265
- `TopologyManager`:启用一种机制来协调 Kubernetes 不同组件的细粒度硬件资源分配。
12591266
详见[控制节点上的拓扑管理策略](/zh-cn/docs/tasks/administer-cluster/topology-manager/)
12601267
- `TopologyManagerPolicyAlphaOptions`:允许微调拓扑管理器策略的实验性的、Alpha 质量的选项。
1261-
此特性门控守护 **一组** 质量级别为 Alpha 的拓扑管理器选项。
1268+
此特性门控守护**一组**质量级别为 Alpha 的拓扑管理器选项。
12621269
此特性门控绝对不会进阶至 Beta 或稳定版。
12631270
- `TopologyManagerPolicyBetaOptions`:允许微调拓扑管理器策略的实验性的、Beta 质量的选项。
1264-
此特性门控守护 **一组** 质量级别为 Beta 的拓扑管理器选项。
1271+
此特性门控守护**一组**质量级别为 Beta 的拓扑管理器选项。
12651272
此特性门控绝对不会进阶至稳定版。
12661273
<!--
12671274
- `TopologyManagerPolicyOptions`: Allow fine-tuning of topology manager policies,
@@ -1283,15 +1290,15 @@ Each feature gate is designed for enabling/disabling a specific feature:
12831290
topologies based on available PV capacity.
12841291
-->
12851292
- `ValidatingAdmissionPolicy`:启用准入控制中所用的对 CEL 校验的 [ValidatingAdmissionPolicy](/zh-cn/docs/reference/access-authn-authz/validating-admission-policy/) 支持。
1286-
- `VolumeCapacityPriority`: 基于可用 PV 容量的拓扑,启用对不同节点的优先级支持。
1293+
- `VolumeCapacityPriority`基于可用 PV 容量的拓扑,启用对不同节点的优先级支持。
12871294
<!--
12881295
- `WatchBookmark`: Enable support for watch bookmark events.
12891296
- `WatchList` : Enable support for [streaming initial state of objects in watch requests](/docs/reference/using-api/api-concepts/#streaming-lists).
12901297
- `WinDSR`: Allows kube-proxy to create DSR loadbalancers for Windows.
12911298
- `WinOverlay`: Allows kube-proxy to run in overlay mode for Windows.
12921299
-->
12931300
- `WatchBookmark`:启用对 watch 操作中 bookmark 事件的支持。
1294-
- `WatchList` : 启用对
1301+
- `WatchList`启用对
12951302
[在 watch 请求中流式传输对象的初始状态](/zh-cn/docs/reference/using-api/api-concepts/#streaming-lists)的支持。
12961303
- `WinDSR`:允许 kube-proxy 为 Windows 创建 DSR 负载均衡。
12971304
- `WinOverlay`:允许在 Windows 的覆盖网络模式下运行 kube-proxy。

0 commit comments

Comments
 (0)