Skip to content

Commit 52784d0

Browse files
authored
Merge pull request #46024 from my-git9/patch-4759
[zh-cn]sync policy kubernetes-api kubeadm-config.v1beta3 hello-minikube apiserver-audit.v1
2 parents bb1724b + 41fe371 commit 52784d0

File tree

5 files changed

+22
-79
lines changed

5 files changed

+22
-79
lines changed

content/zh-cn/docs/concepts/overview/kubernetes-api.md

Lines changed: 6 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ API 以聚合和非聚合形式提供。聚合的发现提供两个端点,而
132132
-->
133133
### 聚合的发现 {#aggregated-discovery}
134134

135-
{{< feature-state state="beta" for_k8s_version="v1.27" >}}
135+
{{< feature-state feature_gate_name="AggregatedDiscoveryEndpoint" >}}
136136

137137
<!--
138-
Kubernetes offers beta support for aggregated discovery, publishing
138+
Kubernetes offers beta support for _aggregated discovery_, publishing
139139
all resources supported by a cluster through two endpoints (`/api` and
140140
`/apis`). Requesting this
141141
endpoint drastically reduces the number of requests sent to fetch the
@@ -144,7 +144,7 @@ requesting the respective endpoints with an `Accept` header indicating
144144
the aggregated discovery resource:
145145
`Accept: application/json;v=v2beta1;g=apidiscovery.k8s.io;as=APIGroupDiscoveryList`.
146146
-->
147-
Kubernetes 为聚合的发现提供了 Beta 支持,通过两个端点(`/api``/apis`)发布集群所支持的所有资源。
147+
Kubernetes **聚合的发现**提供了 Beta 支持,通过两个端点(`/api``/apis`)发布集群所支持的所有资源。
148148
请求这个端点会大大减少从集群获取发现数据时发送的请求数量。你可以通过带有
149149
`Accept` 头(`Accept: application/json;v=v2beta1;g=apidiscovery.k8s.io;as=APIGroupDiscoveryList`
150150
的请求发送到不同端点,来指明聚合发现的资源。
@@ -157,7 +157,7 @@ document.
157157
如果没有使用 `Accept` 头指示资源类型,对于 `/api``/apis` 端点的默认响应将是一个非聚合的发现文档。
158158

159159
<!--
160-
The [discovery document](https://github.com/kubernetes/kubernetes/blob/release-{{< skew currentVersion >}}/api/discovery/aggregated_v2beta1.json)
160+
The [discovery document](https://github.com/kubernetes/kubernetes/blob/release-{{< skew currentVersion >}}/api/discovery/aggregated_v2.json)
161161
for the built-in resources can be found in the Kubernetes GitHub repository.
162162
This Github document can be used as a reference of the base set of the available resources
163163
if a Kubernetes cluster is not available to query.
@@ -455,51 +455,6 @@ Kubernetes stores the serialized state of objects by writing them into
455455

456456
Kubernetes 通过将序列化状态的对象写入到 {{< glossary_tooltip term_id="etcd" >}} 中完成存储操作。
457457

458-
<!--
459-
## API Discovery
460-
461-
A list of all group versions supported by a cluster is published at
462-
the `/api` and `/apis` endpoints. Each group version also advertises
463-
the list of resources supported via `/apis/<group>/<version>` (for
464-
example: `/apis/rbac.authorization.k8s.io/v1alpha1`). These endpoints
465-
are used by kubectl to fetch the list of resources supported by a
466-
cluster.
467-
-->
468-
## API 发现 {#api-discovery}
469-
470-
集群支持的所有组版本列表被发布在 `/api``/apis` 端点。
471-
每个组版本还会通过 `/apis/<group>/<version>`
472-
(例如 `/apis/rbac.authorization.k8s.io/v1alpha1`)广播支持的资源列表。
473-
这些端点由 kubectl 用于获取集群支持的资源列表。
474-
475-
<!--
476-
### Aggregated Discovery
477-
-->
478-
### 聚合发现 {#aggregated-discovery}
479-
480-
{{< feature-state state="beta" for_k8s_version="v1.27" >}}
481-
482-
<!--
483-
Kubernetes offers beta support for aggregated discovery, publishing
484-
all resources supported by a cluster through two endpoints (`/api` and
485-
`/apis`) compared to one for every group version. Requesting this
486-
endpoint drastically reduces the number of requests sent to fetch the
487-
discovery for the average Kubernetes cluster. This may be accessed by
488-
requesting the respective endpoints with an Accept header indicating
489-
the aggregated discovery resource:
490-
`Accept: application/json;v=v2beta1;g=apidiscovery.k8s.io;as=APIGroupDiscoveryList`.
491-
492-
The endpoint also supports ETag and protobuf encoding.
493-
-->
494-
Kubernetes 对聚合发现提供 Beta 支持,通过两个端点(`/api``/apis`
495-
发布集群支持的所有资源,而不是每个组版本都需要一个端点。
496-
请求此端点显著减少了获取平均 Kubernetes 集群发现而发送的请求数量。
497-
通过请求各自的端点并附带表明聚合发现资源
498-
`Accept: application/json;v=v2beta1;g=apidiscovery.k8s.io;as=APIGroupDiscoveryList`
499-
的 Accept 头部来进行访问。
500-
501-
该端点还支持 ETag 和 protobuf 编码。
502-
503458
<!--
504459
## API groups and versioning
505460
@@ -512,7 +467,7 @@ to ensure that the API presents a clear, consistent view of system resources
512467
and behavior, and to enable controlling access to end-of-life and/or
513468
experimental APIs.
514469
-->
515-
## API 组和版本控制 {#api-groups-and-versioning}
470+
## API 组和版本控制 {#api-groups-and-versioning}
516471

517472
为了更容易消除字段或重组资源的呈现方式,Kubernetes 支持多个 API 版本,每个版本位于不同的 API 路径,
518473
例如 `/api/v1``/apis/rbac.authorization.k8s.io/v1alpha1`
@@ -562,7 +517,7 @@ compatibility for a length of time so that other projects have an opportunity to
562517

563518
任何成功的系统都要随着新的使用案例的出现和现有案例的变化来成长和变化。
564519
为此,Kubernetes 已设计了 Kubernetes API 来持续变更和成长。
565-
Kubernetes 项目的目标是 **不要** 给现有客户端带来兼容性问题,并在一定的时期内维持这种兼容性,
520+
Kubernetes 项目的目标是**不要**给现有客户端带来兼容性问题,并在一定的时期内维持这种兼容性,
566521
以便其他项目有机会作出适应性变更。
567522

568523
<!--

content/zh-cn/docs/concepts/policy/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Kubernetes 生态系统中正在开发作为灵活策略引擎的动态准入控
137137
## Apply policies using Kubelet configurations
138138
139139
Kubernetes allows configuring the Kubelet on each worker node. Some Kubelet configurations act as policies:
140-
* [Process ID limts and reservations](/docs/concepts/policy/pid-limiting/) are used to limit and reserve allocatable PIDs.
140+
* [Process ID limits and reservations](/docs/concepts/policy/pid-limiting/) are used to limit and reserve allocatable PIDs.
141141
* [Node Resource Managers](/docs/concepts/policy/node-resource-managers/) can manage compute, memory, and device resources for latency-critical and high-throughput workloads.
142142
-->
143143
## 使用 Kubelet 配置应用策略 {#apply-policies-using-kubelet-configurations}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: kube-apiserver Audit 配置 (v1)
2+
title: kube-apiserver Audit 配置(v1)
33
content_type: tool-reference
44
package: audit.k8s.io/v1
55
---
@@ -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.29/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
114+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#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.29/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
127+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#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.29/#status-v1-meta"><code>meta/v1.Status</code></a>
207+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#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.29/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
260+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#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.29/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
273+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#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.29/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
329+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#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.29/#objectmeta-v1-meta"><code>meta/v1.ObjectMeta</code></a>
371+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#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.29/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
461+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#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/kubeadm-config.v1beta3.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: kubeadm 配置 (v1beta3)
2+
title: kubeadm 配置v1beta3
33
content_type: tool-reference
44
package: kubeadm.k8s.io/v1beta3
55
---
@@ -496,7 +496,7 @@ for, so other administrators can know its purpose.
496496
</td>
497497
</tr>
498498
<tr><td><code>expires</code><br/>
499-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#time-v1-meta"><code>meta/v1.Time</code></a>
499+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#time-v1-meta"><code>meta/v1.Time</code></a>
500500
</td>
501501
<td>
502502
<!--
@@ -1531,7 +1531,7 @@ HostPathMount contains elements describing volumes that are mounted from the hos
15311531
</td>
15321532
</tr>
15331533
<tr><td><code>pathType</code><br/>
1534-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#hostpathtype-v1-core"><code>core/v1.HostPathType</code></a>
1534+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#hostpathtype-v1-core"><code>core/v1.HostPathType</code></a>
15351535
</td>
15361536
<td>
15371537
<!--
@@ -1827,7 +1827,7 @@ This information will be annotated to the Node API object, for later re-use.
18271827
</td>
18281828
</tr>
18291829
<tr><td><code>taints</code> <B><!--[Required]-->[必需]</B><br/>
1830-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#taint-v1-core"><code>[]core/v1.Taint</code></a>
1830+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#taint-v1-core"><code>[]core/v1.Taint</code></a>
18311831
</td>
18321832
<td>
18331833
<!--
@@ -1880,7 +1880,7 @@ the current node is registered, e.g.
18801880
</td>
18811881
</tr>
18821882
<tr><td><code>imagePullPolicy</code><br/>
1883-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#pullpolicy-v1-core"><code>core/v1.PullPolicy</code></a>
1883+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#pullpolicy-v1-core"><code>core/v1.PullPolicy</code></a>
18841884
</td>
18851885
<td>
18861886
<!--

content/zh-cn/docs/tutorials/hello-minikube.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
title: 你好,Minikube
33
content_type: tutorial
44
weight: 5
5-
menu:
6-
main:
7-
title: "Get Started"
8-
weight: 10
9-
post: >
10-
<p>准备好动手操作了么?构建一个简单的 Kubernetes 集群来运行示例应用。</p>
115
card:
126
name: tutorials
137
weight: 10
@@ -16,12 +10,6 @@ card:
1610
title: Hello Minikube
1711
content_type: tutorial
1812
weight: 5
19-
menu:
20-
main:
21-
title: "Get Started"
22-
weight: 10
23-
post: >
24-
<p>Ready to get your hands dirty? Build a simple Kubernetes cluster that runs a sample app.</p>
2513
card:
2614
name: tutorials
2715
weight: 10
@@ -288,7 +276,7 @@ Kubernetes [*Service*](/docs/concepts/services-networking/service/).
288276

289277
默认情况下,Pod 只能通过 Kubernetes 集群中的内部 IP 地址访问。
290278
要使得 `hello-node` 容器可以从 Kubernetes 虚拟网络的外部访问,你必须将 Pod
291-
暴露为 Kubernetes [**Service**](/zh-cn/docs/concepts/services-networking/service/)
279+
通过 Kubernetes [**Service**](/zh-cn/docs/concepts/services-networking/service/) 公开出来
292280

293281
<!--
294282
1. Expose the Pod to the public internet using the `kubectl expose` command:

0 commit comments

Comments
 (0)