Skip to content

Commit d3e2208

Browse files
authored
Merge pull request #38759 from my-git9/zhsync/patch-2
[zh-cn]sync manage-deployment.md secret.md api-concepts.md
2 parents bd86bba + 20d5711 commit d3e2208

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

content/zh-cn/docs/concepts/configuration/secret.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -843,20 +843,6 @@ level.
843843
能够完成与镜像库的身份认证。你可以配置 **镜像拉取 Secret** 来实现这点。
844844
Secret 是在 Pod 层面来配置的。
845845

846-
<!--
847-
The `imagePullSecrets` field for a Pod is a list of references to Secrets in the same namespace
848-
as the Pod.
849-
You can use an `imagePullSecrets` to pass image registry access credentials to
850-
the kubelet. The kubelet uses this information to pull a private image on behalf of your Pod.
851-
See `PodSpec` in the [Pod API reference](/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec)
852-
for more information about the `imagePullSecrets` field.
853-
-->
854-
Pod 的 `imagePullSecrets` 字段是一个对 Pod 所在的名字空间中的 Secret
855-
的引用列表。你可以使用 `imagePullSecrets` 来将镜像仓库访问凭据传递给 kubelet。
856-
kubelet 使用这个信息来替你的 Pod 拉取私有镜像。
857-
参阅 [Pod API 参考](/zh-cn/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec)
858-
中的 `PodSpec` 进一步了解 `imagePullSecrets` 字段。
859-
860846
<!--
861847
#### Using imagePullSecrets
862848

content/zh-cn/docs/reference/using-api/api-concepts.md

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,28 @@ namespace (`/apis/GROUP/VERSION/namespaces/NAMESPACE/*`). A namespace-scoped res
148148
type will be deleted when its namespace is deleted and access to that resource type
149149
is controlled by authorization checks on the namespace scope.
150150
151+
Note: core resources use `/api` instead of `/apis` and omit the GROUP path segment.
152+
153+
Examples:
154+
-->
155+
## 资源 URI {#resource-uris}
156+
157+
所有资源类型要么是集群作用域的(`/apis/GROUP/VERSION/*`),
158+
要么是名字空间作用域的(`/apis/GROUP/VERSION/namespaces/NAMESPACE/*`)。
159+
名字空间作用域的资源类型会在其名字空间被删除时也被删除,
160+
并且对该资源类型的访问是由定义在名字空间域中的授权检查来控制的。
161+
162+
注意: 核心资源使用 `/api` 而不是 `/apis`,并且不包含 GROUP 路径段。
163+
164+
例如:
165+
* `/api/v1/namespaces`
166+
* `/api/v1/pods`
167+
* `/api/v1/namespaces/my-namespace/pods`
168+
* `/apis/apps/v1/deployments`
169+
* `/apis/apps/v1/namespaces/my-namespace/deployments`
170+
* `/apis/apps/v1/namespaces/my-namespace/deployments/my-deployment`
171+
172+
<!--
151173
You can also access collections of resources (for example: listing all Nodes).
152174
The following paths are used to retrieve collections and resources:
153175
@@ -162,13 +184,6 @@ The following paths are used to retrieve collections and resources:
162184
* `GET /apis/GROUP/VERSION/namespaces/NAMESPACE/RESOURCETYPE` - return collection of all instances of the resource type in NAMESPACE
163185
* `GET /apis/GROUP/VERSION/namespaces/NAMESPACE/RESOURCETYPE/NAME` - return the instance of the resource type with NAME in NAMESPACE
164186
-->
165-
## 资源 URI {#resource-uris}
166-
167-
所有资源类型要么是集群作用域的(`/apis/GROUP/VERSION/*`),
168-
要么是名字空间作用域的(`/apis/GROUP/VERSION/namespaces/NAMESPACE/*`)。
169-
名字空间作用域的资源类型会在其名字空间被删除时也被删除,
170-
并且对该资源类型的访问是由定义在名字空间域中的授权检查来控制的。
171-
172187
你还可以访问资源集合(例如:列出所有 Node)。以下路径用于检索集合和资源:
173188

174189
* 集群作用域的资源:
@@ -1175,7 +1190,7 @@ by default.
11751190
The `kubectl` tool uses the `--validate` flag to set the level of field validation.
11761191
Historically `--validate` was used to toggle client-side validation on or off as
11771192
a boolean flag. Since Kubernetes 1.25, kubectl uses
1178-
server-side field validation when sending requests to a serer with this feature
1193+
server-side field validation when sending requests to a server with this feature
11791194
enabled. Validation will fall back to client-side only when it cannot connect
11801195
to an API server with field validation enabled.
11811196
-->

0 commit comments

Comments
 (0)