diff --git a/content/zh/docs/tasks/administer-cluster/change-pv-reclaim-policy.md b/content/zh/docs/tasks/administer-cluster/change-pv-reclaim-policy.md index 950e493f52..eaf763388b 100644 --- a/content/zh/docs/tasks/administer-cluster/change-pv-reclaim-policy.md +++ b/content/zh/docs/tasks/administer-cluster/change-pv-reclaim-policy.md @@ -54,13 +54,16 @@ PersistentVolumes 可以有多种回收策略，包括 "Retain"、"Recycle" 和 kubectl get pv ``` + 输出类似于这样： - ``` - NAME CAPACITY ACCESSMODES RECLAIMPOLICY STATUS CLAIM REASON AGE - pvc-b6efd8da-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim1 10s - pvc-b95650f8-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim2 6s - pvc-bb3ca71d-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim3 3s + ```none + NAME CAPACITY ACCESSMODES RECLAIMPOLICY STATUS CLAIM STORAGECLASS REASON AGE + pvc-b6efd8da-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim1 manual 10s + pvc-b95650f8-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim2 manual 6s + pvc-bb3ca71d-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim3 manual 3s ``` 输出类似于这样： - ``` - NAME CAPACITY ACCESSMODES RECLAIMPOLICY STATUS CLAIM REASON AGE - pvc-b6efd8da-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim1 40s - pvc-b95650f8-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim2 36s - pvc-bb3ca71d-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Retain Bound default/claim3 33s + ```none + NAME CAPACITY ACCESSMODES RECLAIMPOLICY STATUS CLAIM STORAGECLASS REASON AGE + pvc-b6efd8da-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim1 manual 40s + pvc-b95650f8-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Delete Bound default/claim2 manual 36s + pvc-bb3ca71d-b7b5-11e6-9d58-0ed433a7dd94 4Gi RWO Retain Bound default/claim3 manual 33s ``` +* {{< api-reference page="config-and-storage-resources/persistent-volume-v1" >}} + * 注意 PersistentVolume 的 `.spec.persistentVolumeReclaimPolicy` + [字段](/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-v1/#PersistentVolumeSpec)。 +* {{< api-reference page="config-and-storage-resources/persistent-volume-claim-v1" >}} diff --git a/content/zh/docs/tasks/administer-cluster/controller-manager-leader-migration.md b/content/zh/docs/tasks/administer-cluster/controller-manager-leader-migration.md index 71b43494b2..235ff8cbd5 100644 --- a/content/zh/docs/tasks/administer-cluster/controller-manager-leader-migration.md +++ b/content/zh/docs/tasks/administer-cluster/controller-manager-leader-migration.md @@ -15,7 +15,7 @@ content_type: task -{{< feature-state state="beta" for_k8s_version="v1.22" >}} +{{< feature-state for_k8s_version="v1.24" state="stable" >}} {{< glossary_definition term_id="cloud-controller-manager" length="all">}} @@ -48,8 +48,8 @@ Leader Migration can be enabled by setting `--enable-leader-migration` on `kube- Leader Migration only applies during the upgrade and can be safely disabled or left enabled after the upgrade is complete. This guide walks you through the manual process of upgrading the control plane from `kube-controller-manager` with -built-in cloud provider to running both `kube-controller-manager` and `cloud-controller-manager`. -If you use a tool to administrator the cluster, please refer to the documentation of the tool and the cloud provider for more details. +built-in cloud provider to running both `kube-controller-manager` and `cloud-controller-manager`. +If you use a tool to deploy and manage the cluster, please refer to the documentation of the tool and the cloud provider for specific instructions of the migration. --> 领导者迁移可以通过在 `kube-controller-manager` 或 `cloud-controller-manager` 上设置 `--enable-leader-migration` 来启用。 @@ -57,32 +57,32 @@ If you use a tool to administrator the cluster, please refer to the documentatio 本指南将引导你手动将控制平面从内置的云驱动的 `kube-controller-manager` 升级为 同时运行 `kube-controller-manager` 和 `cloud-controller-manager`。 -如果使用某种工具来管理群集，请参阅对应工具和云驱动的文档以获取更多详细信息。 +如果使用某种工具来部署和管理集群，请参阅对应工具和云驱动的文档以获取迁移的具体说明。 ## {{% heading "prerequisites" %}} 假定控制平面正在运行 Kubernetes 版本 N，要升级到版本 N+1。 尽管可以在同一版本内进行迁移，但理想情况下，迁移应作为升级的一部分执行， 以便可以配置的变更可以与发布版本变化对应起来。 -N 和 N+1 的确切版本值取决于各个云厂商。例如，如果云厂商构建了一个可与 Kubernetes 1.22 -配合使用的 `cloud-controller-manager`，则 N 可以为 1.21，N+1 可以为 1.22。 +N 和 N+1 的确切版本值取决于各个云厂商。例如，如果云厂商构建了一个可与 Kubernetes 1.24 +配合使用的 `cloud-controller-manager`，则 N 可以为 1.23，N+1 可以为 1.24。 -控制平面节点应运行 `kube-controller-manager`，并通过 `--leader-elect=true` 启用领导者选举。 +控制平面节点应运行 `kube-controller-manager` 并启用领导者选举，这也是默认设置。 在版本 N 中，树内云驱动必须设置 `--cloud-provider` 标志，而且 `cloud-controller-manager` 应该尚未部署。 +或者，由于控制器可以在任一控制器管理器下运行，因此将双方的 `component` 设置为 `*` +可以使迁移双方的配置文件保持一致。 + +```yaml +# 通配符版本 +kind: LeaderMigrationConfiguration +apiVersion: controllermanager.config.k8s.io/v1 +leaderName: cloud-provider-extraction-migration +controllerLeaders: + - name: route + component: * + - name: service + component: * + - name: cloud-node-lifecycle + component: * +``` + ### 部署云控制器管理器 在版本 N+1 中，如何将控制器分配给不同管理器的预期分配状态可以由新的配置文件表示， 如下所示。请注意，各个 `controllerLeaders` 的 `component` 字段从 `kube-controller-manager` 更改为 `cloud-controller-manager`。 +或者，使用上面提到的通配符版本，它具有相同的效果。 ```yaml kind: LeaderMigrationConfiguration -apiVersion: controllermanager.config.k8s.io/v1beta1 +apiVersion: controllermanager.config.k8s.io/v1 leaderName: cloud-provider-extraction-migration -resourceLock: leases controllerLeaders: - name: route component: cloud-controller-manager @@ -215,15 +236,15 @@ controllerLeaders: ``` +### 特殊情况：迁移节点 IPAM 控制器 {#node-ipam-controller-migration} + +如果你的云供应商提供了节点 IPAM 控制器的实现，你应该切换到 `cloud-controller-manager` 中的实现。 +通过在其标志中添加 `--controllers=*,-nodeipam` 来禁用 N+1 版本的 `kube-controller-manager` 中的节点 IPAM 控制器。 +然后将 `nodeipam` 添加到迁移的控制器列表中。 + +```yaml +# 通配符版本，带有 nodeipam +kind: LeaderMigrationConfiguration +apiVersion: controllermanager.config.k8s.io/v1 +leaderName: cloud-provider-extraction-migration +controllerLeaders: + - name: route + component: * + - name: service + component: * + - name: cloud-node-lifecycle + component: * + - name: nodeipam +- component: * +``` + ## {{% heading "whatsnext" %}} - 阅读[领导者迁移控制器管理器](https://github.com/kubernetes/enhancements/tree/master/keps/sig-cloud-provider/2436-controller-manager-leader-migration) 改进建议提案。