Skip to content

Commit 91ed243

Browse files
authored
Merge pull request #43728 from my-git9/path-14639
[zh-cn] sync extend-kubernetes node-pressure-eviction pod-security-admission
2 parents c265c7d + 56be657 commit 91ed243

File tree

3 files changed

+37
-18
lines changed

3 files changed

+37
-18
lines changed

content/zh-cn/docs/concepts/extend-kubernetes/_index.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ clients that access it.
209209

210210
<!-- image source: https://docs.google.com/drawings/d/1k2YdJgNTtNfW7_A8moIIkij-DmVgEhNrn3y2OODwqQQ/view -->
211211

212-
{{< figure src="/docs/concepts/extend-kubernetes/extension-points.png"
212+
{{< figure src="/docs/concepts/extend-kubernetes/extension-points.svg"
213213
alt="用符号表示的七个编号的 Kubernetes 扩展点"
214214
class="diagram-large" caption="Kubernetes 扩展点" >}}
215215

@@ -445,8 +445,8 @@ allows calling out to custom code that makes an authorization decision.
445445
换言之,它不会基于对象的特定字段作出不同的判决。
446446

447447
如果内置的鉴权选项无法满足你的需要,
448-
你可以使用[鉴权 Webhook](/zh-cn/docs/reference/access-authn-authz/webhook/) 来调用用户提供的代码,
449-
执行定制的鉴权决定。
448+
你可以使用[鉴权 Webhook](/zh-cn/docs/reference/access-authn-authz/webhook/)
449+
来调用用户提供的代码,执行定制的鉴权决定。
450450

451451
<!--
452452
### Dynamic admission control
@@ -645,4 +645,3 @@ not available through the webhook integration.
645645
* 进一步了解[扩展 API 服务器](/zh-cn/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/)
646646
* 进一步了解[动态准入控制](/zh-cn/docs/reference/access-authn-authz/extensible-admission-controllers/)
647647
* 进一步了解 [Operator 模式](/zh-cn/docs/concepts/extend-kubernetes/operator/)
648-

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -196,23 +196,19 @@ kubelet 会自动发现这些文件系统并忽略节点本地的其它文件系
196196
<!--
197197
Some kubelet garbage collection features are deprecated in favor of eviction:
198198
199-
| Existing Flag | New Flag | Rationale |
200-
| ------------- | -------- | --------- |
201-
| `--image-gc-high-threshold` | `--eviction-hard` or `--eviction-soft` | existing eviction signals can trigger image garbage collection |
202-
| `--image-gc-low-threshold` | `--eviction-minimum-reclaim` | eviction reclaims achieve the same behavior |
203-
| `--maximum-dead-containers` | - | deprecated once old logs are stored outside of container's context |
204-
| `--maximum-dead-containers-per-container` | - | deprecated once old logs are stored outside of container's context |
205-
| `--minimum-container-ttl-duration` | - | deprecated once old logs are stored outside of container's context |
199+
| Existing Flag | Rationale |
200+
| ------------- | --------- |
201+
| `--maximum-dead-containers` | deprecated once old logs are stored outside of container's context |
202+
| `--maximum-dead-containers-per-container` | deprecated once old logs are stored outside of container's context |
203+
| `--minimum-container-ttl-duration` | deprecated once old logs are stored outside of container's context |
206204
-->
207205
一些 kubelet 垃圾收集功能已被弃用,以鼓励使用驱逐机制。
208206

209-
| 现有标志 | 新的标志 | 原因 |
210-
| ------------- | -------- | --------- |
211-
| `--image-gc-high-threshold` | `--eviction-hard``--eviction-soft` | 现有的驱逐信号可以触发镜像垃圾收集 |
212-
| `--image-gc-low-threshold` | `--eviction-minimum-reclaim` | 驱逐回收具有相同的行为 |
213-
| `--maximum-dead-containers` | - | 一旦旧的日志存储在容器的上下文之外就会被弃用 |
214-
| `--maximum-dead-containers-per-container` | - | 一旦旧的日志存储在容器的上下文之外就会被弃用 |
215-
| `--minimum-container-ttl-duration` | - | 一旦旧的日志存储在容器的上下文之外就会被弃用 |
207+
| 现有标志 | 原因 |
208+
| ----------------------------------------- | ----------------------------------- |
209+
| `--maximum-dead-containers` | 一旦旧的日志存储在容器的上下文之外就会被弃用 |
210+
| `--maximum-dead-containers-per-container` | 一旦旧的日志存储在容器的上下文之外就会被弃用 |
211+
| `--minimum-container-ttl-duration` | 一旦旧的日志存储在容器的上下文之外就会被弃用 |
216212

217213
<!--
218214
### Eviction thresholds

content/zh-cn/docs/concepts/security/pod-security-admission.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@ current policy level:
246246
- 对 `.spec.activeDeadlineSeconds` 的合法更新
247247
- 对 `.spec.tolerations` 的合法更新
248248

249+
<!--
250+
## Metrics
251+
252+
Here are the Prometheus metrics exposed by kube-apiserver:
253+
-->
254+
## 指标 {#metrics}
255+
256+
以下是 kube-apiserver 公开的 Prometheus 指标:
257+
258+
<!--
259+
- `pod_security_errors_total`: This metric indicates the number of errors preventing normal evaluation.
260+
Non-fatal errors may result in the latest restricted profile being used for enforcement.
261+
- `pod_security_evaluations_total`: This metric indicates the number of policy evaluations that have occurred,
262+
not counting ignored or exempt requests during exporting.
263+
- `pod_security_exemptions_total`: This metric indicates the number of exempt requests, not counting ignored
264+
or out of scope requests.
265+
-->
266+
- `pod_security_errors_total`:此指标表示妨碍正常评估的错误数量。
267+
如果错误是非致命的,kube-apiserver 可能会强制实施最新的受限配置。
268+
- `pod_security_evaluations_total`:此指标表示已发生的策略评估的数量,
269+
不包括导出期间被忽略或豁免的请求。
270+
- `pod_security_exemptions_total`:该指标表示豁免请求的数量,
271+
不包括被忽略或超出范围的请求。
272+
249273
## {{% heading "whatsnext" %}}
250274

251275
<!--

0 commit comments

Comments
 (0)