Skip to content

Commit f906b06

Browse files
authored
Merge pull request #43405 from asa3311/sync-zh-69
[zh] sync list-all-running-container-images reserve-compute-resources managing-tls-in-a-cluster
2 parents d3f6c70 + f39b1e1 commit f906b06

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

content/zh-cn/docs/tasks/access-application-cluster/list-all-running-container-images.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ of Containers for each.
3636
3737
- Fetch all Pods in all namespaces using `kubectl get pods --all-namespaces`
3838
- Format the output to include only the list of Container image names
39-
using `-o jsonpath={.items[*].spec.containers[*].image}`. This will recursively parse out the
39+
using `-o jsonpath={.items[*].spec['initContainers', 'containers'][*].image}`. This will recursively parse out the
4040
`image` field from the returned json.
4141
- See the [jsonpath reference](/docs/reference/kubectl/jsonpath/)
4242
for further information on how to use jsonpath.
@@ -48,7 +48,7 @@ of Containers for each.
4848
## 列出所有命名空间下的所有容器镜像 {#list-all-container-images-in-all-namespaces}
4949

5050
- 使用 `kubectl get pods --all-namespaces` 获取所有命名空间下的所有 Pod
51-
- 使用 `-o jsonpath={.items[*].spec.containers[*].image}` 来格式化输出,以仅包含容器镜像名称。
51+
- 使用 `-o jsonpath={.items[*].spec['initContainers', 'containers'][*].image}` 来格式化输出,以仅包含容器镜像名称。
5252
这将以递归方式从返回的 json 中解析出 `image` 字段。
5353
- 参阅 [jsonpath 说明](/zh-cn/docs/reference/kubectl/jsonpath/)
5454
获取更多关于如何使用 jsonpath 的信息。
@@ -69,14 +69,14 @@ The jsonpath is interpreted as follows:
6969
7070
- `.items[*]`: for each returned value
7171
- `.spec`: get the spec
72-
- `.containers[*]`: for each container
72+
- `['initContainers', 'containers'][*]`: for each container
7373
- `.image`: get the image
7474
-->
7575
jsonpath 解释如下:
7676

7777
- `.items[*]`: 对于每个返回的值
7878
- `.spec`: 获取 spec
79-
- `.containers[*]`: 对于每个容器
79+
- `['initContainers', 'containers'][*]`: 对于每个容器
8080
- `.image`: 获取镜像
8181

8282
<!--

content/zh-cn/docs/tasks/administer-cluster/reserve-compute-resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ for more details on recommended control group hierarchy.
176176

177177
<!--
178178
Note that Kubelet **does not** create `--kube-reserved-cgroup` if it doesn't
179-
exist. Kubelet will fail if an invalid cgroup is specified. With `systemd`
179+
exist. The kubelet will fail to start if an invalid cgroup is specified. With `systemd`
180180
cgroup driver, you should follow a specific pattern for the name of the cgroup you
181181
define: the name should be the value you set for `--kube-reserved-cgroup`,
182182
with `.slice` appended.
183183
-->
184184
请注意,如果 `--kube-reserved-cgroup` 不存在,Kubelet 将 **不会** 创建它。
185-
如果指定了一个无效的 cgroup,Kubelet 将会失败。就 `systemd` cgroup 驱动而言,
185+
如果指定了一个无效的 cgroup,Kubelet 将会无法启动。就 `systemd` cgroup 驱动而言,
186186
你要为所定义的 cgroup 设置名称时要遵循特定的模式:
187187
所设置的名字应该是你为 `--kube-reserved-cgroup` 所给的参数值加上 `.slice` 后缀。
188188

content/zh-cn/docs/tasks/tls/managing-tls-in-a-cluster.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ You need the `cfssl` tool. You can download `cfssl` from
4848
4949
Some steps in this page use the `jq` tool. If you don't have `jq`, you can
5050
install it via your operating system's software sources, or fetch it from
51-
[https://stedolan.github.io/jq/](https://stedolan.github.io/jq/).
51+
[https://jqlang.github.io/jq/](https://jqlang.github.io/jq/).
5252
-->
5353
你需要 `cfssl` 工具。
5454
你可以从 [https://github.com/cloudflare/cfssl/releases](https://github.com/cloudflare/cfssl/releases)
5555
下载 `cfssl`
5656

5757
本文中某些步骤使用 `jq` 工具。如果你没有 `jq`,你可以通过操作系统的软件源安装,
58-
或者从 [https://stedolan.github.io/jq/](https://stedolan.github.io/jq/) 获取。
58+
或者从 [https://jqlang.github.io/jq/](https://jqlang.github.io/jq/) 获取。
5959

6060
<!-- steps -->
6161

@@ -346,7 +346,7 @@ This produces a certificate authority key file (`ca-key.pem`) and certificate (`
346346
<!-- ### Issue a certificate -->
347347
### 颁发证书
348348

349-
{{% code file="tls/server-signing-config.json" %}}
349+
{{% code_sample file="tls/server-signing-config.json" %}}
350350

351351
<!--
352352
Use a `server-signing-config.json` signing configuration and the certificate authority key file
@@ -393,12 +393,12 @@ kubectl get csr my-svc.my-namespace -o json | \
393393

394394
{{< note >}}
395395
<!--
396-
This uses the command line tool [`jq`](https://stedolan.github.io/jq/) to populate the base64-encoded
396+
This uses the command line tool [`jq`](https://jqlang.github.io/jq/) to populate the base64-encoded
397397
content in the `.status.certificate` field.
398398
If you do not have `jq`, you can also save the JSON output to a file, populate this field manually, and
399399
upload the resulting file.
400400
-->
401-
这使用命令行工具 [`jq`](https://stedolan.github.io/jq/)
401+
这使用命令行工具 [`jq`](https://jqlang.github.io/jq/)
402402
`.status.certificate` 字段中填充 base64 编码的内容。
403403
如果你没有 `jq` 工具,你还可以将 JSON 输出保存到文件中,手动填充此字段,然后上传结果文件。
404404
{{< /note >}}

0 commit comments

Comments
 (0)