Skip to content

Commit 2e83ebb

Browse files
authored
Merge pull request #37329 from my-git9/zhsync10
[zh-cn]sync cpu-management-policies.md pull-image-private-registry.md
2 parents 5ad2832 + 1991cbd commit 2e83ebb

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

content/zh-cn/docs/tasks/administer-cluster/cpu-management-policies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ than number of NUMA nodes.
479479
注意,此策略选项不兼容 `TopologyManager` 与 `single-numa-node` 策略,并且不适用于 CPU 的插槽数量大于 NUMA 节点数量的硬件。
480480

481481
<!--
482-
The `full-pcpus-only` option can be enabled by adding `full-pcups-only=true` to
482+
The `full-pcpus-only` option can be enabled by adding `full-pcpus-only=true` to
483483
the CPUManager policy options.
484484
Likewise, the `distribute-cpus-across-numa` option can be enabled by adding
485485
`distribute-cpus-across-numa=true` to the CPUManager policy options.
@@ -490,7 +490,7 @@ The `align-by-socket` policy option can be enabled by adding `align-by-socket=tr
490490
to the `CPUManager` policy options. It is also additive to the `full-pcpus-only`
491491
and `distribute-cpus-across-numa` policy options.
492492
-->
493-
可以通过将 `full-pcups-only=true` 添加到 CPUManager 策略选项来启用 `full-pcpus-only` 选项。
493+
可以通过将 `full-pcpus-only=true` 添加到 CPUManager 策略选项来启用 `full-pcpus-only` 选项。
494494
同样地,可以通过将 `distribute-cpus-across-numa=true` 添加到 CPUManager 策略选项来启用 `distribute-cpus-across-numa` 选项。
495495
当两者都设置时,它们是“累加的”,因为 CPU 将分布在 NUMA 节点的 full-pcpus 块中,而不是单个核心。
496496
可以通过将 `align-by-socket=true` 添加到 `CPUManager` 策略选项来启用 `align-by-socket` 策略选项。

content/zh-cn/docs/tasks/configure-pod-container/pull-image-private-registry.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Use the `docker` tool to log in to Docker Hub. See the _log in_ section of
5858
-->
5959
使用 `docker` 命令工具来登录到 Docker Hub。
6060
更多详细信息,请查阅
61-
[Docker ID accounts](https://docs.docker.com/docker-id/#log-in) 中的 _log in_ 部分。
61+
[Docker ID accounts](https://docs.docker.com/docker-id/#log-in) 中的 **log in** 部分。
6262

6363
```shell
6464
docker login
@@ -99,11 +99,11 @@ The output contains a section similar to this:
9999
}
100100
```
101101

102+
{{< note >}}
102103
<!--
103104
If you use a Docker credentials store, you won't see that `auth` entry but a `credsStore` entry with the name of the store as value.
104105
In that case, you can create a secret directly. See [Create a Secret by providing credentials on the command line](#create-a-secret-by-providing-credentials-on-the-command-line).
105106
-->
106-
{{< note >}}
107107
如果使用 Docker 凭证仓库,则不会看到 `auth` 条目,看到的将是以仓库名称作为值的 `credsStore` 条目。
108108
在这种情况下,你可以直接创建一个 Secret。请参阅[在命令行上提供凭证来创建 Secret](#create-a-secret-by-providing-credentials-on-the-command-line)
109109
{{< /note >}}
@@ -170,7 +170,7 @@ If you get an error message like `Secret "myregistrykey" is invalid: data[.docke
170170
the base64 encoded string in the data was successfully decoded, but could not be parsed as a `.docker/config.json` file.
171171
-->
172172
如果你收到错误消息:`error: no objects passed to create`,
173-
这可能意味着 base64 编码的字符串是无效的。 如果你收到类似
173+
这可能意味着 base64 编码的字符串是无效的。如果你收到类似
174174
`Secret "myregistrykey" is invalid: data[.dockerconfigjson]: invalid value ...`
175175
的错误消息,则表示数据中的 base64 编码字符串已成功解码,
176176
但无法解析为 `.docker/config.json` 文件。
@@ -326,13 +326,13 @@ Download the above file onto your computer:
326326
将上述文件下载到你的计算机中:
327327

328328
```shell
329-
curl -L -O my-private-reg-pod.yaml https://k8s.io/examples/pods/private-reg-pod.yaml
329+
curl -L -o my-private-reg-pod.yaml https://k8s.io/examples/pods/private-reg-pod.yaml
330330
```
331331

332332
<!--
333333
In file `my-private-reg-pod.yaml`, replace `<your-private-image>` with the path to an image in a private registry such as:
334334
-->
335-
在`my-private-reg-pod.yaml` 文件中,使用私有仓库的镜像路径替换 `<your-private-image>`,例如:
335+
`my-private-reg-pod.yaml` 文件中,使用私有仓库的镜像路径替换 `<your-private-image>`,例如:
336336

337337
```none
338338
your.private.registry.example.com/janedoe/jdoe-private:v1
@@ -366,9 +366,9 @@ kubectl get pod private-reg
366366
* See the `imagePullSecrets` field within the [container definitions](/docs/reference/kubernetes-api/workload-resources/pod-v1/#containers) of a Pod
367367
-->
368368

369-
* 进一步了解 [Secrets](/zh-cn/docs/concepts/configuration/secret/)
369+
* 进一步了解 [Secret](/zh-cn/docs/concepts/configuration/secret/)
370370
* 或阅读 {{< api-reference page="config-and-storage-resources/secret-v1" >}} 的 API 参考
371-
* 进一步了解 [使用私有仓库](/zh-cn/docs/concepts/containers/images/#using-a-private-registry)
372-
* 进一步了解 [为服务账户添加拉取镜像凭证](/zh-cn/docs/tasks/configure-pod-container/configure-service-account/#add-imagepullsecrets-to-a-service-account)
371+
* 进一步了解[使用私有仓库](/zh-cn/docs/concepts/containers/images/#using-a-private-registry)
372+
* 进一步了解[为服务账户添加拉取镜像凭证](/zh-cn/docs/tasks/configure-pod-container/configure-service-account/#add-imagepullsecrets-to-a-service-account)
373373
* 查看 [kubectl 创建 docker-registry 凭证](/docs/reference/generated/kubectl/kubectl-commands/#-em-secret-docker-registry-em-)
374374
* 查看 Pod [容器定义](/zh-cn/docs/reference/kubernetes-api/workload-resources/pod-v1/#containers)中的 `imagePullSecrets` 字段。

0 commit comments

Comments
 (0)