Skip to content

Commit fedcc6a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #47948 from my-git9/pp-30084
[zh-cn]sync apiserver-audit.v1 kube-controller-manager-config.v1alpha1 kube-proxy-config.v1alpha1
2 parents de3200a + 93f63bf commit fedcc6a

File tree

3 files changed

+31
-69
lines changed

3 files changed

+31
-69
lines changed

‎content/zh-cn/docs/reference/config-api/apiserver-audit.v1.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Event 结构包含可出现在 API 审计日志中的所有信息。
111111
</tr>
112112

113113
<tr><td><code>user</code> <B><!--[Required]-->[必需]</B><br/>
114-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
114+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
115115
</td>
116116
<td>
117117
<p>
@@ -124,7 +124,7 @@ Event 结构包含可出现在 API 审计日志中的所有信息。
124124
</tr>
125125

126126
<tr><td><code>impersonatedUser</code><br/>
127-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
127+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
128128
</td>
129129
<td>
130130
<p>
@@ -204,7 +204,7 @@ Note: All but the last IP can be arbitrarily set by the client.
204204
</tr>
205205

206206
<tr><td><code>responseStatus</code><br/>
207-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#status-v1-meta"><code>meta/v1.Status</code></a>
207+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#status-v1-meta"><code>meta/v1.Status</code></a>
208208
</td>
209209
<td>
210210
<p>
@@ -257,7 +257,7 @@ Note: All but the last IP can be arbitrarily set by the client.
257257
</tr>
258258

259259
<tr><td><code>requestReceivedTimestamp</code><br/>
260-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
260+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
261261
</td>
262262
<td>
263263
<!--
@@ -270,7 +270,7 @@ Note: All but the last IP can be arbitrarily set by the client.
270270
</tr>
271271

272272
<tr><td><code>stageTimestamp</code><br/>
273-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
273+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
274274
</td>
275275
<td>
276276
<p>
@@ -326,7 +326,7 @@ EventList 是审计事件（Event）的列表。
326326
<tr><td><code>kind</code><br/>string</td><td><code>EventList</code></td></tr>
327327

328328
<tr><td><code>metadata</code><br/>
329-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
329+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
330330
</td>
331331
<td>
332332
<span class="text-muted"><!--No description provided.-->列表结构元数据</span>
@@ -368,7 +368,7 @@ Policy 定义的是审计日志的配置以及不同类型请求的日志记录
368368
<tr><td><code>kind</code><br/>string</td><td><code>Policy</code></td></tr>
369369

370370
<tr><td><code>metadata</code><br/>
371-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#objectmeta-v1-meta"><code>meta/v1.ObjectMeta</code></a>
371+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#objectmeta-v1-meta"><code>meta/v1.ObjectMeta</code></a>
372372
</td>
373373
<td>
374374
<p>
@@ -458,7 +458,7 @@ PolicyList 是由审计策略（Policy）组成的列表。
458458
<tr><td><code>kind</code><br/>string</td><td><code>PolicyList</code></td></tr>
459459

460460
<tr><td><code>metadata</code><br/>
461-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
461+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
462462
</td>
463463
<td>
464464
<span class="text-muted"><!--No description provided.-->列表结构元数据。</span>

‎content/zh-cn/docs/reference/config-api/kube-controller-manager-config.v1alpha1.md

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@ auto_generated: true
1414
- [CloudControllerManagerConfiguration](#cloudcontrollermanager-config-k8s-io-v1alpha1-CloudControllerManagerConfiguration)
1515
- [LeaderMigrationConfiguration](#controllermanager-config-k8s-io-v1alpha1-LeaderMigrationConfiguration)
1616
- [KubeControllerManagerConfiguration](#kubecontrollermanager-config-k8s-io-v1alpha1-KubeControllerManagerConfiguration)
17-
18-
19-
2017

2118
## `NodeControllerConfiguration` {#NodeControllerConfiguration}
22-
2319

2420
<!--
2521
**Appears in:**
@@ -55,7 +51,6 @@ NodeControllerConfiguration 包含描述 NodeController 的元素。
5551
</table>
5652

5753
## `ServiceControllerConfiguration` {#ServiceControllerConfiguration}
58-
5954

6055
<!--
6156
**Appears in:**
@@ -94,11 +89,8 @@ ServiceControllerConfiguration 包含描述 ServiceController 的元素。
9489
</tr>
9590
</tbody>
9691
</table>
97-
9892

9993
## `CloudControllerManagerConfiguration` {#cloudcontrollermanager-config-k8s-io-v1alpha1-CloudControllerManagerConfiguration}
100-
101-
10294

10395
<p>
10496
<!-- CloudControllerManagerConfiguration contains elements describing cloud-controller manager.-->
@@ -1760,16 +1752,6 @@ HPAControllerConfiguration 包含描述 HPAController 的元素。
17601752
</p>
17611753
</td>
17621754
</tr>
1763-
<tr><td><code>HorizontalPodAutoscalerUpscaleForbiddenWindow</code> <B><!--[Required]-->[必需]</B><br/>
1764-
<a href="https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#Duration"><code>meta/v1.Duration</code></a>
1765-
</td>
1766-
<td>
1767-
<p>
1768-
<!-- HorizontalPodAutoscalerUpscaleForbiddenWindow is a period after which next upscale allowed. -->
1769-
HorizontalPodAutoscalerUpscaleForbiddenWindow 是一个时间段，过了这一时间段才允许下一次扩容
1770-
</p>
1771-
</td>
1772-
</tr>
17731755
<tr><td><code>HorizontalPodAutoscalerDownscaleStabilizationWindow</code> <B><!--[Required]-->[必需]</B><br/>
17741756
<a href="https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#Duration"><code>meta/v1.Duration</code></a>
17751757
</td>
@@ -1784,16 +1766,6 @@ HPAControllerConfiguration 包含描述 HPAController 的元素。
17841766
</p>
17851767
</td>
17861768
</tr>
1787-
<tr><td><code>HorizontalPodAutoscalerDownscaleForbiddenWindow</code> <B><!--[Required]-->[必需]</B><br/>
1788-
<a href="https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#Duration"><code>meta/v1.Duration</code></a>
1789-
</td>
1790-
<td>
1791-
<p>
1792-
<!-- HorizontalPodAutoscalerDownscaleForbiddenWindow is a period after which next downscale allowed. -->
1793-
HorizontalPodAutoscalerDownscaleForbiddenWindow 是一个时间段长度，过了此时间段才允许执行下一此缩容操作。
1794-
</p>
1795-
</td>
1796-
</tr>
17971769
<tr><td><code>HorizontalPodAutoscalerTolerance</code> <B><!--[Required]-->[必需]</B><br/>
17981770
<code>float64</code>
17991771
</td>
@@ -2185,28 +2157,6 @@ PersistentVolumeBinderControllerConfiguration 包含描述 PersistentVolumeBinde
21852157
</p>
21862158
</td>
21872159
</tr>
2188-
<tr><td><code>VolumeHostCIDRDenylist</code> <B><!--[Required]-->[必需]</B><br/>
2189-
<code>[]string</code>
2190-
</td>
2191-
<td>
2192-
<p>
2193-
<!-- DEPRECATED: VolumeHostCIDRDenylist is a list of CIDRs that should not be reachable by the
2194-
controller from plugins. -->
2195-
已弃用：VolumeHostCIDRDenylist 是一个不能被插件中控制器访问的 CIDR 列表。
2196-
</p>
2197-
</td>
2198-
</tr>
2199-
<tr><td><code>VolumeHostAllowLocalLoopback</code> <B><!--[Required]-->[必需]</B><br/>
2200-
<code>bool</code>
2201-
</td>
2202-
<td>
2203-
<p>
2204-
<!-- DEPRECATED: VolumeHostAllowLocalLoopback indicates if local loopback hosts (127.0.0.1, etc)
2205-
should be allowed from plugins. -->
2206-
已弃用：VolumeHostAllowLocalLoopback 表示是否应该允许插件使用本地回路主机地址（127.0.0.1 等）。
2207-
</p>
2208-
</td>
2209-
</tr>
22102160
</tbody>
22112161
</table>
22122162

@@ -2220,7 +2170,6 @@ should be allowed from plugins. -->
22202170

22212171
- [VolumeConfiguration](#kubecontrollermanager-config-k8s-io-v1alpha1-VolumeConfiguration)
22222172

2223-
22242173
<p>
22252174
<!-- PersistentVolumeRecyclerConfiguration contains elements describing persistent volume plugins. -->
22262175
PersistentVolumeRecyclerConfiguration 包含描述持久卷插件的元素。
@@ -2754,4 +2703,3 @@ VolumeConfiguration 包含<em>所有</em>用于配置各个卷插件的所有参
27542703
</tr>
27552704
</tbody>
27562705
</table>
2757-

‎content/zh-cn/docs/reference/config-api/kube-proxy-config.v1alpha1.md

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,9 @@ Profiling handlers will be handled by metrics server.
468468
</td>
469469
<td>
470470
<!--
471-
detectLocalMode determines mode to use for detecting local traffic, defaults to LocalModeClusterCIDR.
471+
detectLocalMode determines mode to use for detecting local traffic, defaults to ClusterCIDR.
472472
-->
473-
<p><code>detectLocalMode</code> 确定用于检测本地流量的模式，默认为 LocalModeClusterCIDR。</p>
473+
<p><code>detectLocalMode</code> 确定用于检测本地流量的模式，默认为 ClusterCIDR。</p>
474474
</td>
475475
</tr>
476476
<tr><td><code>detectLocal</code> <B><!--[Required]-->[必需]</B><br/>
@@ -490,7 +490,7 @@ Profiling handlers will be handled by metrics server.
490490
<!--
491491
clusterCIDR is the CIDR range of the pods in the cluster. (For dual-stack
492492
clusters, this can be a comma-separated dual-stack pair of CIDR ranges.). When
493-
DetectLocalMode is set to LocalModeClusterCIDR, kube-proxy will consider
493+
DetectLocalMode is set to ClusterCIDR, kube-proxy will consider
494494
traffic to be local if its source IP is in this range. (Otherwise it is not
495495
used.)
496496
-->
@@ -505,13 +505,15 @@ used.)
505505
</td>
506506
<td>
507507
<!--
508-
nodePortAddresses is a list of CIDR ranges that contain valid node IPs. If set,
509-
connections to NodePort services will only be accepted on node IPs in one of
510-
the indicated ranges. If unset, NodePort connections will be accepted on all
511-
local IPs.
508+
nodePortAddresses is a list of CIDR ranges that contain valid node IPs, or
509+
alternatively, the single string 'primary'. If set to a list of CIDRs,
510+
the indicated ranges. If set to 'primary', NodePort services will only be
511+
accepted on the node's primary IPv4 and/or IPv6 address according to the Node
512+
object. If unset, NodePort connections will be accepted on all local IPs.</p>
512513
-->
513-
<p><code>nodePortAddresses</code> 是一个包含有效节点 IP 的 CIDR 范围列表。
514-
如果设置了此项，只有来自这些范围内的节点 IP 的 NodePort 服务连接才会被接受。
514+
<p><code>nodePortAddresses</code> 是一个包含有效节点 IP 的 CIDR 范围列表或单个字符串 `primary`。
515+
如果设置为 CIDR 范围列表，只有来自这些范围内的节点 IP 的 NodePort 服务连接才会被接受。
516+
如果设置为 `primary`，则根据 Node 对象，NodePort 服务将仅在节点的主 IPv4 和/或 IPv6 地址上被接受。
515517
如果未设置，将接受所有本地 IP 的 NodePort 连接。</p>
516518
</td>
517519
</tr>
@@ -558,6 +560,18 @@ than 0.
558560
<p><code>portRange</code> 之前用于配置用户空间代理，但现在已不再使用。</p>
559561
</td>
560562
</tr>
563+
<tr><td><code>windowsRunAsService</code> <B>[Required]</B><br/>
564+
<code>bool</code>
565+
</td>
566+
<td>
567+
<p>
568+
<!--
569+
windowsRunAsService, if true, enables Windows service control manager API integration.
570+
-->
571+
如果为 <code>windowsRunAsService</code> 为 True，则启用 Windows 服务控制管理器 API 集成。
572+
</p>
573+
</td>
574+
</tr>
561575

562576
</tbody>
563577
</table>

0 commit comments

Comments
 (0)