Skip to content

Commit 8b1e4a4

Browse files
authored
Merge pull request #52134 from asa3311/sync-zh-193
[zh] sync service user-namespaces
2 parents 7a3beb3 + c67b743 commit 8b1e4a4

File tree

2 files changed

+33
-5
lines changed

2 files changed

+33
-5
lines changed

content/zh-cn/docs/concepts/services-networking/service.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,9 +1732,10 @@ Kubernetes {{< skew currentVersion >}} 支持以下字段值:
17321732
{{< feature-state feature_gate_name="PreferSameTrafficDistribution" >}}
17331733

17341734
<!--
1735-
Two additional values are available when the `PreferSameTrafficDistribution`
1736-
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/) is
1737-
enabled:
1735+
In Kubernetes {{< skew currentVersion >}}, two additional values are
1736+
available (unless the `PreferSameTrafficDistribution` [feature
1737+
gate](/docs/reference/command-line-tools-reference/feature-gates/) is
1738+
disabled):
17381739

17391740
`PreferSameZone`
17401741
: This is an alias for `PreferClose` that is clearer about the intended semantics.
@@ -1743,8 +1744,9 @@ enabled:
17431744
: Indicates a preference for routing traffic to endpoints that are on the same
17441745
node as the client.
17451746
-->
1746-
当 `PreferSameTrafficDistribution`
1747-
[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)被启用时,还可以使用两个附加的取值:
1747+
在 Kubernetes {{< skew currentVersion >}} 中,
1748+
另外提供了两个可选值(除非禁用了 `PreferSameTrafficDistribution`
1749+
[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/) ):
17481750

17491751
`PreferSameZone`
17501752
: 这是 `PreferClose` 的别名,但它更清晰地表达了预期的语义。

content/zh-cn/docs/concepts/workloads/pods/user-namespaces.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,32 @@ allowed to set any of:
508508
* `hostIPC: true`
509509
* `hostPID: true`
510510

511+
<!--
512+
No container can use `volumeDevices` (raw block volumes, like /dev/sda) either.
513+
This includes all the container arrays in the pod spec:
514+
* `containers`
515+
* `initContainers`
516+
* `ephemeralContainers`
517+
-->
518+
任何容器都不能使用 `volumeDevices`(原始块设备卷,例如 /dev/sda)。
519+
这包括 Pod 规约中的所有容器数组:
520+
* `containers`
521+
* `initContainers`
522+
* `ephemeralContainers`
523+
524+
<!--
525+
## Metrics and observability
526+
527+
The kubelet exports two prometheus metrics specific to user-namespaces:
528+
* `started_user_namespaced_pods_total`: a counter that tracks the number of user namespaced pods that are attempted to be created.
529+
* `started_user_namespaced_pods_errors_total`: a counter that tracks the number of errors creating user namespaced pods.
530+
-->
531+
## 指标与可观测性
532+
533+
kubelet 会导出两项与用户命名空间相关的 Prometheus 指标:
534+
* `started_user_namespaced_pods_total`:这个计数器跟踪尝试创建的、作用域为用户命名空间的 Pod 数量。
535+
* `started_user_namespaced_pods_errors_total`:这个计数器跟踪创建作用域为用户命名空间的 Pod 时发生的错误次数。
536+
511537
## {{% heading "whatsnext" %}}
512538

513539
<!--

0 commit comments

Comments
 (0)