Skip to content

Commit 28e2690

Browse files
authored
Merge pull request #37034 from my-git9/somesync
[zh-cn] sync node-pressure-eviction.md persistent-volumes.md pull-image-private-registry.md
2 parents f59d9e6 + 91a6feb commit 28e2690

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

content/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ weight: 60
1313

1414
<!--
1515
The {{<glossary_tooltip term_id="kubelet" text="kubelet">}} monitors resources
16-
like CPU, memory, disk space, and filesystem inodes on your cluster's nodes.
16+
like memory, disk space, and filesystem inodes on your cluster's nodes.
1717
When one or more of these resources reach specific consumption levels, the
1818
kubelet can proactively fail one or more pods on the node to reclaim resources
1919
and prevent starvation.
@@ -25,7 +25,7 @@ Node-pressure eviction is not the same as
2525
[API-initiated eviction](/docs/concepts/scheduling-eviction/api-eviction/).
2626
-->
2727
{{<glossary_tooltip term_id="kubelet" text="kubelet">}}
28-
监控集群节点的 CPU、内存、磁盘空间和文件系统的 inode 等资源。
28+
监控集群节点的内存、磁盘空间和文件系统的 inode 等资源。
2929
当这些资源中的一个或者多个达到特定的消耗水平,
3030
kubelet 可以主动地使节点上一个或者多个 Pod 失效,以回收资源防止饥饿。
3131

content/zh-cn/docs/concepts/storage/persistent-volumes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ Kubernetes 控制平面将看到两个资源的所需状态匹配,
604604
-->
605605
#### CSI 卷的扩充 {#csi-volume-expansion}
606606

607-
{{< feature-state for_k8s_version="v1.16" state="beta" >}}
607+
{{< feature-state for_k8s_version="v1.24" state="stable" >}}
608608

609609
<!--
610610
Support for expanding CSI volumes is enabled by default but it also requires a specific CSI driver to support volume expansion. Refer to documentation of the specific CSI driver for more information.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,11 @@ The output contains a section similar to this:
101101

102102
<!--
103103
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.
104+
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).
104105
-->
105106
{{< note >}}
106107
如果使用 Docker 凭证仓库,则不会看到 `auth` 条目,看到的将是以仓库名称作为值的 `credsStore` 条目。
108+
在这种情况下,你可以直接创建一个 Secret。请参阅[在命令行上提供凭证来创建 Secret](#create-a-secret-by-providing-credentials-on-the-command-line)
107109
{{< /note >}}
108110

109111
<!--

0 commit comments

Comments
 (0)