Merge pull request #43288 from windsonsea/v1beta1

[zh] Update kubernetes-api/other-resources files
2023-10-02 05:50:44 -07:00 · 2023-10-02 05:50:44 -07:00 · 3d97727582
parent a4d634d6b8 5b4e2d4652
commit 3d97727582
3 changed files with 33 additions and 94 deletions
--- a/content/zh-cn/docs/reference/kubernetes-api/authentication-resources/service-account-v1.md
+++ b/content/zh-cn/docs/reference/kubernetes-api/authentication-resources/service-account-v1.md
@ -7,9 +7,7 @@ content_type: "api_reference"
 description: "ServiceAccount 将以下内容绑定在一起：1. 用户可以理解的名称，也可能是外围系统理解的身份标识 2. 可以验证和授权的主体 3. 一组 Secret。"
 title: "ServiceAccount"
 weight: 1
-auto_generated: true
 ---
-
 <!--
 api_metadata:
  apiVersion: "v1"
@ -22,28 +20,17 @@ weight: 1
 auto_generated: true
 -->

-<!--
-The file is auto-generated from the Go source code of the component using a generic
-[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
-to generate the reference documentation, please read
-[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
-To update the reference content, please follow the
-[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
-guide. You can file document formatting bugs against the
-[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
-->
-
 `apiVersion: v1`

 `import "k8s.io/api/core/v1"`

-
 ## ServiceAccount {#ServiceAccount}

 <!--
 ServiceAccount binds together: * a name, understood by users, and perhaps by peripheral systems, for an identity * a principal that can be authenticated and authorized * a set of secrets
 -->
 ServiceAccount 将以下内容绑定在一起：
+
 * 用户可以理解的名称，也可能是外围系统理解的身份标识
 * 可以验证和授权的主体
 * 一组 Secret
@ -52,16 +39,15 @@ ServiceAccount 将以下内容绑定在一起：

 - **apiVersion**: v1

-
 - **kind**: ServiceAccount

-
 - **metadata** (<a href="{{< ref "../common-definitions/object-meta#ObjectMeta" >}}">ObjectMeta</a>)

  <!--
  Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
  -->
-  标准对象的元数据，更多信息： https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+  标准对象的元数据，更多信息：
+  https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata

 - **automountServiceAccountToken** (boolean)

@ -77,8 +63,8 @@ ServiceAccount 将以下内容绑定在一起：
  ImagePullSecrets is a list of references to secrets in the same namespace to use for pulling any images in pods that reference this ServiceAccount. ImagePullSecrets are distinct from Secrets because Secrets can be mounted in the pod, but ImagePullSecrets are only accessed by the kubelet. More info: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
  -->
  imagePullSecrets 是对同一命名空间中 Secret 的引用列表，用于拉取引用此 ServiceAccount 的 Pod 中的任何镜像。
-  imagePullSecrets 与 Secrets 不同，因为 Secrets 可以挂载在 Pod 中，但 imagePullSecrets 只能由 kubelet 访问。
-  更多信息： https://kubernetes.io/zh-cn/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
+  imagePullSecrets 与 Secret 不同，因为 Secret 可以挂载在 Pod 中，但 imagePullSecrets 只能由 kubelet 访问。更多信息：
+  https://kubernetes.io/zh-cn/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod

 - **secrets** ([]<a href="{{< ref "../common-definitions/object-reference#ObjectReference" >}}">ObjectReference</a>)

@ -94,7 +80,7 @@ ServiceAccount 将以下内容绑定在一起：
  -->
  **补丁策略：基于键 `name` 合并**

-  Secrets 是允许使用此 ServiceAccount 运行的 Pod 使用的同一命名空间中的秘密列表。
+  secrets 是允许使用此 ServiceAccount 运行的 Pod 使用的同一命名空间中的秘密列表。
  仅当此服务帐户的 “kubernetes.io/enforce-mountable-secrets” 注释设置为 “true” 时，Pod 才限于此列表。
  此字段不应用于查找自动生成的服务帐户令牌机密以在 Pod 之外使用。
  相反，可以使用 TokenRequest API 直接请求令牌，或者可以手动创建服务帐户令牌 Secret。
@ -111,16 +97,15 @@ ServiceAccountList 是 ServiceAccount 对象的列表

 - **apiVersion**: v1

-
 - **kind**: ServiceAccountList

-
 - **metadata** (<a href="{{< ref "../common-definitions/list-meta#ListMeta" >}}">ListMeta</a>)

  <!--
  Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
  -->
-  标准列表元数据, 更多信息： https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+  标准列表元数据, 更多信息：
+  https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds

 <!--
 - **items** ([]<a href="{{< ref "../authentication-resources/service-account-v1#ServiceAccount" >}}">ServiceAccount</a>), required
@ -130,7 +115,8 @@ ServiceAccountList 是 ServiceAccount 对象的列表
  <!--
  List of ServiceAccounts. More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
  -->
-  ServiceAccount 列表，更多信息： https://kubernetes.io/zh-cn/docs/tasks/configure-pod-container/configure-service-account/
+  ServiceAccount 列表，更多信息：
+  https://kubernetes.io/zh-cn/docs/tasks/configure-pod-container/configure-service-account/

 <!--
 ## Operations {#Operations}
@ -157,13 +143,12 @@ GET /api/v1/namespaces/{namespace}/serviceaccounts/{name}

 <!--
 - **name** (*in path*): string, required
+
+  name of the ServiceAccount
 -->
 - **name** (**路径参数**): string, 必需

-  <!--
-  name of the ServiceAccount
-  -->
-  ServiceAccount 的名称
+  ServiceAccount 的名称。

 <!--
 - **namespace** (*in path*): string, required
@ -240,7 +225,6 @@ GET /api/v1/namespaces/{namespace}/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#labelSelector" >}}">labelSelector</a>

-
 <!--
 - **limit** (*in query*): integer
 -->
@ -337,7 +321,6 @@ GET /api/v1/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#fieldSelector" >}}">fieldSelector</a>

-
 <!--
 - **labelSelector** (*in query*): string
 -->
@ -394,7 +377,6 @@ GET /api/v1/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#watch" >}}">watch</a>

-
 <!--
 #### Response
 -->
@ -453,7 +435,6 @@ POST /api/v1/namespaces/{namespace}/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#fieldValidation" >}}">fieldValidation</a>

-
 <!--
 - **pretty** (*in query*): string
 -->
@ -461,7 +442,6 @@ POST /api/v1/namespaces/{namespace}/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#pretty" >}}">pretty</a>

-
 <!--
 #### Response
 -->
@ -480,7 +460,7 @@ POST /api/v1/namespaces/{namespace}/serviceaccounts

 #### HTTP Request
 -->
-`update` 替换指定的ServiceAccount
+### `update` 替换指定的 ServiceAccount

 #### HTTP 请求

@ -493,11 +473,12 @@ PUT /api/v1/namespaces/{namespace}/serviceaccounts/{name}

 <!--
 - **name** (*in path*): string, required
-->
- **name** (**路径参数**): string, required

  name of the ServiceAccount
+-->
+- **name** (**路径参数**): string，必需

+  ServiceAccount 的名称。

 <!--
 - **namespace** (*in path*): string, required
@ -532,7 +513,6 @@ PUT /api/v1/namespaces/{namespace}/serviceaccounts/{name}

  <a href="{{< ref "../common-parameters/common-parameters#fieldValidation" >}}">fieldValidation</a>

-
 <!--
 - **pretty** (*in query*): string
 -->
@ -556,7 +536,7 @@ PUT /api/v1/namespaces/{namespace}/serviceaccounts/{name}

 #### HTTP Request
 -->
-`patch` 部分更新指定的 ServiceAccount
+### `patch` 部分更新指定的 ServiceAccount

 #### HTTP 请求

@ -569,13 +549,12 @@ PATCH /api/v1/namespaces/{namespace}/serviceaccounts/{name}

 <!--
 - **name** (*in path*): string, required
+
+  name of the ServiceAccount
 -->
 - **name** (**路径参数**): string，必需

-  <!--
-  name of the ServiceAccount
-  -->
-  ServiceAccount 的名称
+  ServiceAccount 的名称。

 <!--
 - **namespace** (*in path*): string, required
@ -587,7 +566,6 @@ PATCH /api/v1/namespaces/{namespace}/serviceaccounts/{name}

 - **body**: <a href="{{< ref "../common-definitions/patch#Patch" >}}">Patch</a>, required

-
 <!--
 - **dryRun** (*in query*): string
 -->
@ -616,7 +594,6 @@ PATCH /api/v1/namespaces/{namespace}/serviceaccounts/{name}

  <a href="{{< ref "../common-parameters/common-parameters#force" >}}">force</a>

-
 <!--
 - **pretty** (*in query*): string
 -->
@ -624,13 +601,11 @@ PATCH /api/v1/namespaces/{namespace}/serviceaccounts/{name}

  <a href="{{< ref "../common-parameters/common-parameters#pretty" >}}">pretty</a>

-
 <!--
 #### Response
 -->
 #### 响应

-
 200 (<a href="{{< ref "../authentication-resources/service-account-v1#ServiceAccount" >}}">ServiceAccount</a>): OK

 201 (<a href="{{< ref "../authentication-resources/service-account-v1#ServiceAccount" >}}">ServiceAccount</a>): Created
@ -643,8 +618,8 @@ PATCH /api/v1/namespaces/{namespace}/serviceaccounts/{name}
 #### HTTP Request
 -->
 ### `delete` 删除一个 ServiceAccount
-#### HTTP 请求

+#### HTTP 请求

 DELETE /api/v1/namespaces/{namespace}/serviceaccounts/{name}

@ -655,14 +630,12 @@ DELETE /api/v1/namespaces/{namespace}/serviceaccounts/{name}

 <!--
 - **name** (*in path*): string, required
+
+  name of the ServiceAccount
 -->
 - **name** (**路径参数**): string，必需

-  <!--
-  name of the ServiceAccount
-  -->
-  ServiceAccount 的名称
-
+  ServiceAccount 的名称。

 <!--
 - **namespace** (*in path*): string, required
@ -671,7 +644,6 @@ DELETE /api/v1/namespaces/{namespace}/serviceaccounts/{name}

  <a href="{{< ref "../common-parameters/common-parameters#namespace" >}}">namespace</a>

-
 - **body**: <a href="{{< ref "../common-definitions/delete-options#DeleteOptions" >}}">DeleteOptions</a>

 <!--
@ -688,7 +660,6 @@ DELETE /api/v1/namespaces/{namespace}/serviceaccounts/{name}

  <a href="{{< ref "../common-parameters/common-parameters#gracePeriodSeconds" >}}">gracePeriodSeconds</a>

-
 <!--
 - **pretty** (*in query*): string
 -->
@ -696,12 +667,10 @@ DELETE /api/v1/namespaces/{namespace}/serviceaccounts/{name}

  <a href="{{< ref "../common-parameters/common-parameters#pretty" >}}">pretty</a>

-
 - **propagationPolicy** (*in query*): string

  <a href="{{< ref "../common-parameters/common-parameters#propagationPolicy" >}}">propagationPolicy</a>

-
 <!--
 #### Response
 -->
@ -736,7 +705,6 @@ DELETE /api/v1/namespaces/{namespace}/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#namespace" >}}">namespace</a>

-
 - **body**: <a href="{{< ref "../common-definitions/delete-options#DeleteOptions" >}}">DeleteOptions</a>

 <!--
@ -746,7 +714,6 @@ DELETE /api/v1/namespaces/{namespace}/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#continue" >}}">continue</a>

-
 <!--
 - **dryRun** (*in query*): string
 -->
@ -761,7 +728,6 @@ DELETE /api/v1/namespaces/{namespace}/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#fieldSelector" >}}">fieldSelector</a>

-
 <!--
 - **gracePeriodSeconds** (*in query*): integer
 -->
@ -783,7 +749,6 @@ DELETE /api/v1/namespaces/{namespace}/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#limit" >}}">limit</a>

-
 <!--
 - **pretty** (*in query*): string
 -->
@ -826,7 +791,6 @@ DELETE /api/v1/namespaces/{namespace}/serviceaccounts

  <a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>

-
 <!--
 #### Response
 -->
--- a/content/zh-cn/docs/reference/kubernetes-api/other-resources/_index.md
+++ b/content/zh-cn/docs/reference/kubernetes-api/other-resources/_index.md
@ -7,15 +7,3 @@ title: "Other Resources"
 weight: 10
 auto_generated: true
 -->
-
-<!--
-The file is auto-generated from the Go source code of the component using a generic
-[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
-to generate the reference documentation, please read
-[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
-To update the reference content, please follow the 
-[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
-guide. You can file document formatting bugs against the
-[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
-->
-
--- a/content/zh-cn/docs/reference/kubernetes-api/other-resources/validating-admission-policy-binding-list-v1alpha1.md
+++ b/content/zh-cn/docs/reference/kubernetes-api/other-resources/validating-admission-policy-binding-list-v1alpha1.md
@ -1,38 +1,25 @@
 ---
 api_metadata:
-  apiVersion: "admissionregistration.k8s.io/v1alpha1"
-  import: "k8s.io/api/admissionregistration/v1alpha1"
+  apiVersion: "admissionregistration.k8s.io/v1beta1"
+  import: "k8s.io/api/admissionregistration/v1beta1"
  kind: "ValidatingAdmissionPolicyBindingList"
 content_type: "api_reference"
 description: ""
-title: "ValidatingAdmissionPolicyBindingList v1alpha1"
+title: "ValidatingAdmissionPolicyBindingList v1beta1"
 weight: 1
 ---
 <!--
 api_metadata:
-  apiVersion: "admissionregistration.k8s.io/v1alpha1"
-  import: "k8s.io/api/admissionregistration/v1alpha1"
+  apiVersion: "admissionregistration.k8s.io/v1beta1"
+  import: "k8s.io/api/admissionregistration/v1beta1"
  kind: "ValidatingAdmissionPolicyBindingList"
 content_type: "api_reference"
 description: ""
-title: "ValidatingAdmissionPolicyBindingList v1alpha1"
+title: "ValidatingAdmissionPolicyBindingList v1beta1"
 weight: 1
 auto_generated: true
 -->

-<!--
-The file is auto-generated from the Go source code of the component using a generic
-[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
-to generate the reference documentation, please read
-[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
-To update the reference content, please follow the 
-[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
-guide. You can file document formatting bugs against the
-[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
-->
-
-`apiVersion: admissionregistration.k8s.io/v1alpha1`
-
-`import "k8s.io/api/admissionregistration/v1alpha1"`
-
+`apiVersion: admissionregistration.k8s.io/v1beta1`

+`import "k8s.io/api/admissionregistration/v1beta1"`