diff --git a/content/zh-cn/docs/concepts/services-networking/service.md b/content/zh-cn/docs/concepts/services-networking/service.md index 8d66e269ee..5672e7cd0f 100644 --- a/content/zh-cn/docs/concepts/services-networking/service.md +++ b/content/zh-cn/docs/concepts/services-networking/service.md @@ -2000,7 +2000,7 @@ for that Service. When you define a Service, you can specify `externalIPs` for any [service type](#publishing-services-service-types). In the example below, the Service named `"my-service"` can be accessed by clients using TCP, -on `"198.51.100.32:80"` (calculated from `.spec.externalIP` and `.spec.port`). +on `"198.51.100.32:80"` (calculated from `.spec.externalIPs[]` and `.spec.ports[].port`). --> ### 外部 IP {#external-ips} @@ -2011,7 +2011,7 @@ on `"198.51.100.32:80"` (calculated from `.spec.externalIP` and `.spec.port`). 定义 Service 时,你可以为任何[服务类型](#publishing-services-service-types)指定 `externalIPs`。 在下面的例子中,名为 `my-service` 的服务可以在 "`198.51.100.32:80`" -(从 .spec.externalIP 和 .spec.port 计算)上被客户端使用 TCP 协议访问。 +(从 `.spec.externalIPs[]` 和 `.spec.ports[].port` 计算)上被客户端使用 TCP 协议访问。 ```yaml apiVersion: v1 diff --git a/content/zh-cn/docs/concepts/workloads/pods/user-namespaces.md b/content/zh-cn/docs/concepts/workloads/pods/user-namespaces.md index f3f5738ced..3743274941 100644 --- a/content/zh-cn/docs/concepts/workloads/pods/user-namespaces.md +++ b/content/zh-cn/docs/concepts/workloads/pods/user-namespaces.md @@ -90,7 +90,7 @@ to use this feature with Kubernetes stateless pods: * CRI-O: version 1.25 (and later) supports user namespaces for containers. Please note that containerd v1.7 supports user namespaces for containers, -compatible with Kubernetes {{< skew currentVersion >}}. It should not be used +compatible with Kubernetes {{< skew currentPatchVersion >}}. It should not be used with Kubernetes 1.27 (and later). 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. * CRI-O:1.25(及更高)版本支持配置容器的用户命名空间。 -请注意,containerd v1.7 支持配置容器的用户命名空间,与 Kubernetes {{< skew currentVersion >}} +请注意,containerd v1.7 支持配置容器的用户命名空间,与 Kubernetes {{< skew currentPatchVersion >}} 兼容。它不应与 Kubernetes 1.27(及更高)版本一起使用。 目前 [cri-dockerd 没有计划][CRI-dockerd-issue]支持此功能。 diff --git a/content/zh-cn/docs/tasks/administer-cluster/controller-manager-leader-migration.md b/content/zh-cn/docs/tasks/administer-cluster/controller-manager-leader-migration.md index 1a95b08a56..eba3ea5577 100644 --- a/content/zh-cn/docs/tasks/administer-cluster/controller-manager-leader-migration.md +++ b/content/zh-cn/docs/tasks/administer-cluster/controller-manager-leader-migration.md @@ -9,7 +9,7 @@ weight: 250 reviewers: - jpbetz - cheftako -title: "Migrate Replicated Control Plane To Use Cloud Controller Manager" +title: Migrate Replicated Control Plane To Use Cloud Controller Manager linkTitle: "Migrate Replicated Control Plane To Use Cloud Controller Manager" content_type: task weight: 250 @@ -24,11 +24,16 @@ weight: 250 As part of the [cloud provider extraction effort](/blog/2019/04/17/the-future-of-cloud-providers-in-kubernetes/), all cloud specific controllers must be moved out of the `kube-controller-manager`. -All existing clusters that run cloud controllers in the `kube-controller-manager` must migrate to instead run the controllers in a cloud provider specific `cloud-controller-manager`. +All existing clusters that run cloud controllers in the `kube-controller-manager` +must migrate to instead run the controllers in a cloud provider specific +`cloud-controller-manager`. -Leader Migration provides a mechanism in which HA clusters can safely migrate "cloud specific" controllers between -the `kube-controller-manager` and the `cloud-controller-manager` via a shared resource lock between the two components while upgrading the replicated control plane. -For a single-node control plane, or if unavailability of controller managers can be tolerated during the upgrade, Leader Migration is not needed and this guide can be ignored. +Leader Migration provides a mechanism in which HA clusters can safely migrate "cloud +specific" controllers between the `kube-controller-manager` and the +`cloud-controller-manager` via a shared resource lock between the two components +while upgrading the replicated control plane. For a single-node control plane, or if +unavailability of controller managers can be tolerated during the upgrade, Leader +Migration is not needed and this guide can be ignored. --> ## 背景 @@ -44,12 +49,16 @@ For a single-node control plane, or if unavailability of controller managers can 亦可以忽略本指南。 领导者迁移可以通过在 `kube-controller-manager` 或 `cloud-controller-manager` 上设置 `--enable-leader-migration` 来启用。 @@ -62,12 +71,18 @@ If you use a tool to deploy and manage the cluster, please refer to the document ## {{% heading "prerequisites" %}} 假定控制平面正在运行 Kubernetes 版本 N,要升级到版本 N+1。 尽管可以在同一版本内进行迁移,但理想情况下,迁移应作为升级的一部分执行, @@ -80,17 +95,22 @@ N 和 N+1 的确切版本值取决于各个云厂商。例如,如果云厂商 应该尚未部署。 树外云驱动必须已经构建了一个实现了领导者迁移的 `cloud-controller-manager`。 如果云驱动导入了 v0.21.0 或更高版本的 `k8s.io/cloud-provider` 和 `k8s.io/controller-manager`, @@ -110,12 +130,12 @@ please grant the needed access in a way that matches the mode. ### 初始领导者迁移配置 @@ -168,8 +196,9 @@ controllerLeaders: ``` 或者,由于控制器可以在任一控制器管理器下运行,因此将双方的 `component` 设置为 `*` 可以使迁移双方的配置文件保持一致。 @@ -189,14 +218,17 @@ controllerLeaders: ``` 在每个控制平面节点上,请将如上内容保存到 `/etc/leadermigration.conf` 中, 并更新 `kube-controller-manager` 清单,以便将文件挂载到容器内的同一位置。 @@ -211,9 +243,11 @@ Restart `kube-controller-manager` on each node. At this moment, `kube-controller ### 部署云控制器管理器 @@ -236,15 +270,19 @@ controllerLeaders: ``` ### 升级控制平面 @@ -294,14 +336,16 @@ N+1 的 `cloud-controller-manager` 下运行,具体取决于哪个控制器管 ### (可选)禁用领导者迁移 {#disable-leader-migration} @@ -318,10 +362,14 @@ Lease 资源。在将来可以安全地重新启用领导者迁移,以完成 ### 默认配置 {#default-configuration} @@ -335,9 +383,11 @@ For `kube-controller-manager` and `cloud-controller-manager`, if there are no fl ### 特殊情况:迁移节点 IPAM 控制器 {#node-ipam-controller-migration} @@ -363,7 +413,8 @@ controllerLeaders: ## {{% heading "whatsnext" %}} - 阅读[领导者迁移控制器管理器](https://github.com/kubernetes/enhancements/tree/master/keps/sig-cloud-provider/2436-controller-manager-leader-migration) 改进建议提案。