Skip to content

Commit 3933bbf

Browse files
authored
Merge pull request #41602 from asa3311/sync-zh-8
[zh-cn] sync patch-releases kubeadm_init_phase_addon_coredns feature-gates-removed
2 parents 23c89f3 + 01acc6f commit 3933bbf

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ In the following table:
11951195
`attach` and `port-forward` requests.
11961196
11971197
- `SupportIPVSProxyMode`: Enable providing in-cluster service load balancing using IPVS.
1198-
See [service proxies](/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies) for more details.
1198+
See [service proxies](/docs/reference/networking/virtual-ips/) for more details.
11991199
12001200
- `SupportNodePidsLimit`: Enable the support to limiting PIDs on the Node. The parameter
12011201
`pid=<number>` in the `--system-reserved` and `--kube-reserved` options can be specified to
@@ -1209,7 +1209,7 @@ In the following table:
12091209
流请求的例子包括 `exec``attach``port-forward` 请求。
12101210

12111211
- `SupportIPVSProxyMode`:启用使用 IPVS 提供集群内服务负载平衡。更多详细信息,
1212-
请参见[服务代理](/zh-cn/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies)
1212+
请参见[服务代理](/zh-cn/docs/reference/networking/virtual-ips/)
12131213

12141214
- `SupportNodePidsLimit`:启用支持,限制节点上的 PID 用量。
12151215
`--system-reserved``--kube-reserved` 中的参数 `pid=<数值>`

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_addon_coredns.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ Don't apply any changes; just output what would be done.
6666
<tr>
6767
<td></td><td style="line-height: 130%; word-wrap: break-word;">
6868
<!--
69-
A set of key=value pairs that describe feature gates for various features. Options are:<br/>PublicKeysECDSA=true|false (ALPHA - default=false)<br/>RootlessControlPlane=true|false (ALPHA - default=false)
69+
A set of key=value pairs that describe feature gates for various features. Options are:<br/>EtcdLearnerMode=true|false (ALPHA - default=false)<br/>PublicKeysECDSA=true|false (ALPHA - default=false)<br/>RootlessControlPlane=true|false (ALPHA - default=false)
7070
-->
7171
<p>
7272
一组用来描述各种特性门控的键值(key=value)对。选项是:
73+
<br/>EtcdLearnerMode=true|false (ALPHA - 默认值=false)
7374
<br/>PublicKeysECDSA=true|false (ALPHA - 默认值=false)
7475
<br/>RootlessControlPlane=true|false (ALPHA - 默认值=false)
7576
</p>

content/zh-cn/releases/patch-releases.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,17 @@ releases may also occur in between these.
149149
<!--
150150
| Monthly Patch Release | Cherry Pick Deadline | Target date |
151151
| --------------------- | -------------------- | ----------- |
152-
| April 2023 | 2023-04-07 | 2023-04-12 |
153152
| May 2023 | 2023-05-12 | 2023-05-17 |
154153
| June 2023 | 2023-06-09 | 2023-06-14 |
154+
| July 2023 | 2023-07-07 | 2023-07-12 |
155+
| August 2023 | 2023-08-04 | 2023-08-09 |
155156
-->
156157
| 月度补丁发布 | Cherry Pick 截止日期 | 目标日期 |
157158
|------------|------------------|------------|
158-
| 2023 年 4 月 | 2023-04-07 | 2023-04-12 |
159159
| 2023 年 5 月 | 2023-05-12 | 2023-05-17 |
160160
| 2023 年 6 月 | 2023-06-09 | 2023-06-14 |
161+
| 2023 年 7 月 | 2023-07-07 | 2023-07-12 |
162+
| 2023 年 8 月 | 2023-08-04 | 2023-08-09 |
161163

162164
<!--
163165
## Detailed Release History for Active Branches
@@ -176,3 +178,14 @@ These releases are no longer supported.
176178
不再支持这些版本。
177179

178180
{{< eol-releases >}}
181+
182+
<!--
183+
[cherry-picks]: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md
184+
[release-managers]: /releases/release-managers
185+
[release process description]: /releases/release
186+
[yearly-support]: https://git.k8s.io/enhancements/keps/sig-release/1498-kubernetes-yearly-support-period/README.md
187+
-->
188+
[精选提交]https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md
189+
[发布管理员]:/zh-cn/releases/release-managers
190+
[发布流程介绍]:/zh-cn/releases/release
191+
[年度支持]https://git.k8s.io/enhancements/keps/sig-release/1498-kubernetes-yearly-support-period/README.md

0 commit comments

Comments
 (0)