From 995278c9fbb80cb15136c68970b384cc91030397 Mon Sep 17 00:00:00 2001 From: Indeed Date: Thu, 8 Jul 2021 21:20:13 -0700 Subject: [PATCH] add ControllerManagerLeaderMigration as beta This feature was in staging/src/k8s.io/controller-manager/pkg/features/kube_features.go but missing here. --- pkg/features/kube_features.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 7bc5d0de2ac..9b1e6ed2af7 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -795,6 +795,13 @@ const ( // // Allow fine-tuning of cpumanager policies CPUManagerPolicyOptions featuregate.Feature = "CPUManagerPolicyOptions" + + // owner: @jiahuif + // alpha: v1.21 + // beta: v1.22 + // + // Enables Leader Migration for kube-controller-manager and cloud-controller-manager + ControllerManagerLeaderMigration featuregate.Feature = "ControllerManagerLeaderMigration" ) func init() { @@ -913,6 +920,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha}, MemoryQoS: {Default: false, PreRelease: featuregate.Alpha}, CPUManagerPolicyOptions: {Default: false, PreRelease: featuregate.Alpha}, + ControllerManagerLeaderMigration: {Default: true, PreRelease: featuregate.Beta}, // inherited features from generic apiserver, relisted here to get a conflict if it is changed // unintentionally on either side: