Merge pull request #113534 from pacoxu/ControllerManagerLeaderMigration

remove FG ControllerManagerLeaderMigration

pkg/features/kube_features.go

@@ -192,14 +192,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
@@ -892,8 +884,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},
 
 	DelegateFSGroupToCSIDriver: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.28

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},
 }

staging/src/k8s.io/controller-manager/pkg/leadermigration/feature.go

@@ -1,28 +0,0 @@
-/*
-Copyright 2021 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-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)
-}

staging/src/k8s.io/controller-manager/pkg/leadermigration/options/options.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/spf13/pflag"
 	"k8s.io/controller-manager/config"
-	"k8s.io/controller-manager/pkg/leadermigration"
 	migrationconfig "k8s.io/controller-manager/pkg/leadermigration/config"
 )
 
@@ -65,9 +64,6 @@ func (o *LeaderMigrationOptions) ApplyTo(cfg *config.GenericControllerManagerCon
 		cfg.LeaderMigrationEnabled = false
 		return nil
 	}
-	if o.Enabled && !leadermigration.FeatureEnabled() {
-		return fmt.Errorf("Leader Migration is not enabled through feature gate")
-	}
 	cfg.LeaderMigrationEnabled = o.Enabled
 	if !cfg.LeaderMigrationEnabled {
 		return nil

staging/src/k8s.io/controller-manager/pkg/leadermigration/util.go

@@ -21,5 +21,5 @@ import config "k8s.io/controller-manager/config"
 // Enabled checks whether Leader Migration should be enabled, given the GenericControllerManagerConfiguration.
 // It considers the feature gate first, and will always return false if the feature gate is not enabled.
 func Enabled(genericConfig *config.GenericControllerManagerConfiguration) bool {
-	return FeatureEnabled() && genericConfig.LeaderElection.LeaderElect && genericConfig.LeaderMigrationEnabled
+	return genericConfig.LeaderElection.LeaderElect && genericConfig.LeaderMigrationEnabled
 }