Skip to content

Commit 4133feb

Browse files
authored
Merge pull request #48053 from my-git9/pp-10825
[zh-cn] sync taint-and-toleration ephemeral-volumes
2 parents 0eab13f + 9a0a7a5 commit 4133feb

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

content/zh-cn/docs/concepts/scheduling-eviction/taint-and-toleration.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,15 @@ A toleration "matches" a taint if the keys are the same and the effects are the
141141
<!--
142142
There are two special cases:
143143

144-
An empty `key` with operator `Exists` matches all keys, values and effects which means this
145-
will tolerate everything.
144+
If the `key` is empty, then the `operator` must be `Exists`, which matches all keys and values. Note that the `effect` still needs to be matched at the same time.
146145

147146
An empty `effect` matches all effects with key `key1`.
148147
-->
149148
存在两种特殊情况:
150149

150+
如果 `key` 为空,那么 `operator` 必须是 `Exists`,匹配所有 key 和 value。
151+
注意,同时 `effect` 仍然需要匹配。
152+
151153
如果一个容忍度的 `key` 为空且 `operator` 为 `Exists`,
152154
表示这个容忍度与任意的 key、value 和 effect 都匹配,即这个容忍度能容忍任何污点。
153155

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ different purposes:
7272
[downwardAPI](/docs/concepts/storage/volumes/#downwardapi),
7373
[secret](/docs/concepts/storage/volumes/#secret): inject different
7474
kinds of Kubernetes data into a Pod
75+
- [image](/docs/concepts/storage/volumes/#image): allows mounting container image files or artifacts,
76+
directly to a Pod.
7577
- [CSI ephemeral volumes](#csi-ephemeral-volumes):
7678
similar to the previous volume kinds, but provided by special {{< glossary_tooltip text="CSI" term_id="csi" >}} drivers
7779
which specifically [support this feature](https://kubernetes-csi.github.io/docs/ephemeral-local-volumes.html)
@@ -85,6 +87,8 @@ Kubernetes 为了不同的用途,支持几种不同类型的临时卷:
8587
[downwardAPI](/zh-cn/docs/concepts/storage/volumes/#downwardapi)
8688
[secret](/zh-cn/docs/concepts/storage/volumes/#secret)
8789
将不同类型的 Kubernetes 数据注入到 Pod 中
90+
- [镜像](/zh-cn/docs/concepts/storage/volumes/#image)
91+
允许将容器镜像文件或制品直接挂载到 Pod。
8892
- [CSI 临时卷](#csi-ephemeral-volumes)
8993
类似于前面的卷类型,但由专门[支持此特性](https://kubernetes-csi.github.io/docs/ephemeral-local-volumes.html)
9094
的指定 {{< glossary_tooltip text="CSI" term_id="csi" >}} 驱动程序提供

0 commit comments

Comments
 (0)