Skip to content

Commit 8a614ca

Browse files
authored
Merge pull request #32668 from tengqm/LeaderMigration-ga
ControllerLeaderMigration is GA
2 parents a3be045 + f3a06f4 commit 8a614ca

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

content/en/docs/reference/command-line-tools-reference/feature-gates.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ different Kubernetes components.
6464
| `AnyVolumeDataSource` | `false` | Alpha | 1.18 | 1.23 |
6565
| `AnyVolumeDataSource` | `true` | Beta | 1.24 | |
6666
| `AppArmor` | `true` | Beta | 1.4 | |
67-
| `ControllerManagerLeaderMigration` | `false` | Alpha | 1.21 | 1.21 |
68-
| `ControllerManagerLeaderMigration` | `true` | Beta | 1.22 | |
6967
| `CPUManager` | `false` | Alpha | 1.8 | 1.9 |
7068
| `CPUManager` | `true` | Beta | 1.10 | |
7169
| `CPUManagerPolicyAlphaOptions` | `false` | Alpha | 1.23 | |
@@ -225,7 +223,10 @@ different Kubernetes components.
225223
| `BoundServiceAccountTokenVolume` | `true` | GA | 1.22 | - |
226224
| `ConfigurableFSGroupPolicy` | `false` | Alpha | 1.18 | 1.19 |
227225
| `ConfigurableFSGroupPolicy` | `true` | Beta | 1.20 | 1.22 |
228-
| `ConfigurableFSGroupPolicy` | `true` | GA | 1.23 | |
226+
| `ConfigurableFSGroupPolicy` | `true` | GA | 1.23 | - |
227+
| `ControllerManagerLeaderMigration` | `false` | Alpha | 1.21 | 1.21 |
228+
| `ControllerManagerLeaderMigration` | `true` | Beta | 1.22 | 1.23 |
229+
| `ControllerManagerLeaderMigration` | `true` | GA | 1.24 | - |
229230
| `CRIContainerLogRotation` | `false` | Alpha | 1.10 | 1.10 |
230231
| `CRIContainerLogRotation` | `true` | Beta | 1.11 | 1.20 |
231232
| `CRIContainerLogRotation` | `true` | GA | 1.21 | - |
@@ -234,7 +235,7 @@ different Kubernetes components.
234235
| `CSIBlockVolume` | `true` | GA | 1.18 | - |
235236
| `CSIDriverRegistry` | `false` | Alpha | 1.12 | 1.13 |
236237
| `CSIDriverRegistry` | `true` | Beta | 1.14 | 1.17 |
237-
| `CSIDriverRegistry` | `true` | GA | 1.18 | |
238+
| `CSIDriverRegistry` | `true` | GA | 1.18 | - |
238239
| `CSIMigrationAWSComplete` | `false` | Alpha | 1.17 | 1.20 |
239240
| `CSIMigrationAWSComplete` | - | Deprecated | 1.21 | - |
240241
| `CSIMigrationAzureDisk` | `false` | Alpha | 1.15 | 1.18 |
@@ -256,16 +257,16 @@ different Kubernetes components.
256257
| `CSIMigrationvSphereComplete` | - | Deprecated | 1.22 | - |
257258
| `CSINodeInfo` | `false` | Alpha | 1.12 | 1.13 |
258259
| `CSINodeInfo` | `true` | Beta | 1.14 | 1.16 |
259-
| `CSINodeInfo` | `true` | GA | 1.17 | |
260+
| `CSINodeInfo` | `true` | GA | 1.17 | - |
260261
| `CSIPersistentVolume` | `false` | Alpha | 1.9 | 1.9 |
261262
| `CSIPersistentVolume` | `true` | Beta | 1.10 | 1.12 |
262263
| `CSIPersistentVolume` | `true` | GA | 1.13 | - |
263264
| `CSIServiceAccountToken` | `false` | Alpha | 1.20 | 1.20 |
264265
| `CSIServiceAccountToken` | `true` | Beta | 1.21 | 1.21 |
265-
| `CSIServiceAccountToken` | `true` | GA | 1.22 | |
266+
| `CSIServiceAccountToken` | `true` | GA | 1.22 | - |
266267
| `CSIStorageCapacity` | `false` | Alpha | 1.19 | 1.20 |
267268
| `CSIStorageCapacity` | `true` | Beta | 1.21 | 1.23 |
268-
| `CSIStorageCapacity` | `true` | GA | 1.24 | |
269+
| `CSIStorageCapacity` | `true` | GA | 1.24 | - |
269270
| `CSIVolumeFSGroupPolicy` | `false` | Alpha | 1.19 | 1.19 |
270271
| `CSIVolumeFSGroupPolicy` | `true` | Beta | 1.20 | 1.22 |
271272
| `CSIVolumeFSGroupPolicy` | `true` | GA | 1.23 | |
@@ -316,7 +317,7 @@ different Kubernetes components.
316317
| `EndpointSlice` | `false` | Alpha | 1.16 | 1.16 |
317318
| `EndpointSlice` | `false` | Beta | 1.17 | 1.17 |
318319
| `EndpointSlice` | `true` | Beta | 1.18 | 1.20 |
319-
| `EndpointSlice` | `true` | GA | 1.21 | - |
320+
| `EndpointSlice` | `true` | GA | 1.21 | - |
320321
| `EndpointSliceNodeName` | `false` | Alpha | 1.20 | 1.20 |
321322
| `EndpointSliceNodeName` | `true` | GA | 1.21 | - |
322323
| `EndpointSliceProxying` | `false` | Alpha | 1.18 | 1.18 |
@@ -489,9 +490,9 @@ different Kubernetes components.
489490
| `SupportPodPidsLimit` | `true` | GA | 1.20 | - |
490491
| `SuspendJob` | `false` | Alpha | 1.21 | 1.21 |
491492
| `SuspendJob` | `true` | Beta | 1.22 | 1.23 |
492-
| `SuspendJob` | `true` | GA | 1.24 | |
493+
| `SuspendJob` | `true` | GA | 1.24 | - |
493494
| `Sysctls` | `true` | Beta | 1.11 | 1.20 |
494-
| `Sysctls` | `true` | GA | 1.21 | |
495+
| `Sysctls` | `true` | GA | 1.21 | - |
495496
| `TTLAfterFinished` | `false` | Alpha | 1.12 | 1.20 |
496497
| `TTLAfterFinished` | `true` | Beta | 1.21 | 1.22 |
497498
| `TTLAfterFinished` | `true` | GA | 1.23 | - |

content/en/docs/tasks/administer-cluster/controller-manager-leader-migration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ linkTitle: "Migrate Replicated Control Plane To Use Cloud Controller Manager"
77
content_type: task
88
---
99

10-
1110
<!-- overview -->
1211

13-
{{< feature-state state="beta" for_k8s_version="v1.22" >}}
12+
{{< feature-state for_k8s_version="v1.24" state="stable" >}}
1413

1514
{{< glossary_definition term_id="cloud-controller-manager" length="all" prepend="The cloud-controller-manager is">}}
1615

@@ -95,7 +94,7 @@ controllerLeaders:
9594
component: cloud-controller-manager
9695
```
9796

98-
When creating control plane nodes of version N + 1, the content should be deploy to `/etc/leadermigration.conf`. The manifest of `cloud-controller-manager` should be updated to mount the configuration file in the same manner as `kube-controller-manager` of version N. Similarly, add `--feature-gates=ControllerManagerLeaderMigration=true`,`--enable-leader-migration`, and `--leader-migration-config=/etc/leadermigration.conf` to the arguments of `cloud-controller-manager`.
97+
When creating control plane nodes of version N + 1, the content should be deploy to `/etc/leadermigration.conf`. The manifest of `cloud-controller-manager` should be updated to mount the configuration file in the same manner as `kube-controller-manager` of version N. Similarly, add `--enable-leader-migration` and `--leader-migration-config=/etc/leadermigration.conf` to the arguments of `cloud-controller-manager`.
9998

10099
Create a new control plane node of version N + 1 with the updated `cloud-controller-manager` manifest, and with the `--cloud-provider` flag unset for `kube-controller-manager`. `kube-controller-manager` of version N + 1 MUST NOT have Leader Migration enabled because, with an external cloud provider, it does not run the migrated controllers anymore and thus it is not involved in the migration.
101100

@@ -123,4 +122,5 @@ For `kube-controller-manager` and `cloud-controller-manager`, if there are no fl
123122

124123
## {{% heading "whatsnext" %}}
125124

126-
- Read the [Controller Manager Leader Migration](https://github.com/kubernetes/enhancements/tree/master/keps/sig-cloud-provider/2436-controller-manager-leader-migration) enhancement proposal
125+
- Read the [Controller Manager Leader Migration](https://github.com/kubernetes/enhancements/tree/master/keps/sig-cloud-provider/2436-controller-manager-leader-migration) enhancement proposal.
126+

0 commit comments

Comments
 (0)