Skip to content

Commit b9bb302

Browse files
authored
Merge pull request #41585 from my-git9/path-4458
[zh-cn] sync service user-namespaces controller-manager-leader-migration
2 parents 445db9c + 4c69081 commit b9bb302

File tree

3 files changed

+132
-81
lines changed

3 files changed

+132
-81
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,7 +2000,7 @@ for that Service.
20002000
When you define a Service, you can specify `externalIPs` for any
20012001
[service type](#publishing-services-service-types).
20022002
In the example below, the Service named `"my-service"` can be accessed by clients using TCP,
2003-
on `"198.51.100.32:80"` (calculated from `.spec.externalIP` and `.spec.port`).
2003+
on `"198.51.100.32:80"` (calculated from `.spec.externalIPs[]` and `.spec.ports[].port`).
20042004
-->
20052005
### 外部 IP {#external-ips}
20062006

@@ -2011,7 +2011,7 @@ on `"198.51.100.32:80"` (calculated from `.spec.externalIP` and `.spec.port`).
20112011
定义 Service 时,你可以为任何[服务类型](#publishing-services-service-types)指定 `externalIPs`。
20122012

20132013
在下面的例子中,名为 `my-service` 的服务可以在 "`198.51.100.32:80`"
2014-
(从 .spec.externalIP 和 .spec.port 计算)上被客户端使用 TCP 协议访问。
2014+
(从 `.spec.externalIPs[]``.spec.ports[].port` 计算)上被客户端使用 TCP 协议访问。
20152015

20162016
```yaml
20172017
apiVersion: v1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ to use this feature with Kubernetes stateless pods:
9090
* CRI-O: version 1.25 (and later) supports user namespaces for containers.
9191
9292
Please note that containerd v1.7 supports user namespaces for containers,
93-
compatible with Kubernetes {{< skew currentVersion >}}. It should not be used
93+
compatible with Kubernetes {{< skew currentPatchVersion >}}. It should not be used
9494
with Kubernetes 1.27 (and later).
9595
9696
Support for this in [cri-dockerd is not planned][CRI-dockerd-issue] yet.
@@ -101,7 +101,7 @@ Support for this in [cri-dockerd is not planned][CRI-dockerd-issue] yet.
101101

102102
* CRI-O:1.25(及更高)版本支持配置容器的用户命名空间。
103103

104-
请注意,containerd v1.7 支持配置容器的用户命名空间,与 Kubernetes {{< skew currentVersion >}}
104+
请注意,containerd v1.7 支持配置容器的用户命名空间,与 Kubernetes {{< skew currentPatchVersion >}}
105105
兼容。它不应与 Kubernetes 1.27(及更高)版本一起使用。
106106

107107
目前 [cri-dockerd 没有计划][CRI-dockerd-issue]支持此功能。

0 commit comments

Comments
 (0)