diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 6ae2eb086bd..824c15df681 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -198,14 +198,6 @@ const ( // Normalize HttpGet URL and Header passing for lifecycle handlers with probers. ConsistentHTTPGetHandlers featuregate.Feature = "ConsistentHTTPGetHandlers" - // owner: @jiahuif - // alpha: v1.21 - // beta: v1.22 - // GA: v1.24 - // - // Enables Leader Migration for kube-controller-manager and cloud-controller-manager - ControllerManagerLeaderMigration featuregate.Feature = "ControllerManagerLeaderMigration" - // owner: @deejross, @soltysh // kep: https://kep.k8s.io/3140 // alpha: v1.24 @@ -867,8 +859,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS ConsistentHTTPGetHandlers: {Default: true, PreRelease: featuregate.GA}, - ControllerManagerLeaderMigration: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26 - CronJobTimeZone: {Default: true, PreRelease: featuregate.Beta}, DaemonSetUpdateSurge: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.27 diff --git a/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go b/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go index 62d44a09ef1..1d80bd2b963 100644 --- a/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go +++ b/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go @@ -32,15 +32,6 @@ const ( // of code conflicts because changes are more likely to be scattered // across the file. - // owner: @jiahuif - // alpha: v1.21 - // beta: v1.22 - // GA: v1.24 - // - // Enables Leader Migration for kube-controller-manager and cloud-controller-manager - // copied and sync'ed from k8s.io/kubernetes/pkg/features/kube_features.go - ControllerManagerLeaderMigration featuregate.Feature = "ControllerManagerLeaderMigration" - // owner: @khenidak // alpha: v1.15 // @@ -56,7 +47,5 @@ func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.Mutable // cloudPublicFeatureGates consists of cloud-specific feature keys. // To add a new feature, define a key for it at k8s.io/api/pkg/features and add it here. var cloudPublicFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ - ControllerManagerLeaderMigration: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26 - IPv6DualStack: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, } diff --git a/staging/src/k8s.io/controller-manager/pkg/leadermigration/feature.go b/staging/src/k8s.io/controller-manager/pkg/leadermigration/feature.go index fec07edb155..f9803d5ba28 100644 --- a/staging/src/k8s.io/controller-manager/pkg/leadermigration/feature.go +++ b/staging/src/k8s.io/controller-manager/pkg/leadermigration/feature.go @@ -17,12 +17,10 @@ limitations under the License. package leadermigration import ( - "k8s.io/apiserver/pkg/util/feature" - "k8s.io/controller-manager/pkg/features" _ "k8s.io/controller-manager/pkg/features/register" ) // FeatureEnabled tells if leader migration is enabled through the feature gate. func FeatureEnabled() bool { - return feature.DefaultMutableFeatureGate.Enabled(features.ControllerManagerLeaderMigration) + return true }