github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

remove FG ControllerManagerLeaderMigration

Browse Source
This commit is contained in:
Paco Xu 2022-11-02 15:49:09 +08:00
parent ccf57ba09d
commit eadb0a29c5
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/features/kube_features.go
View File

@ -198,14 +198,6 @@ const (
// Normalize HttpGet URL and Header passing for lifecycle handlers with probers. // Normalize HttpGet URL and Header passing for lifecycle handlers with probers.
ConsistentHTTPGetHandlers featuregate.Feature = "ConsistentHTTPGetHandlers" 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 // owner: @deejross, @soltysh
// kep: https://kep.k8s.io/3140 // kep: https://kep.k8s.io/3140
// alpha: v1.24 // alpha: v1.24
@ -867,8 +859,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
ConsistentHTTPGetHandlers: {Default: true, PreRelease: featuregate.GA}, ConsistentHTTPGetHandlers: {Default: true, PreRelease: featuregate.GA},
ControllerManagerLeaderMigration: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26
CronJobTimeZone: {Default: true, PreRelease: featuregate.Beta}, CronJobTimeZone: {Default: true, PreRelease: featuregate.Beta},
DaemonSetUpdateSurge: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.27 DaemonSetUpdateSurge: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.27

11
staging/src/k8s.io/controller-manager/pkg/features/kube_features.go
View File

@ -32,15 +32,6 @@ const (
// of code conflicts because changes are more likely to be scattered // of code conflicts because changes are more likely to be scattered
// across the file. // 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 // owner: @khenidak
// alpha: v1.15 // alpha: v1.15
// //
@ -56,7 +47,5 @@ func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.Mutable
// cloudPublicFeatureGates consists of cloud-specific feature keys. // 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. // 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{ 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}, IPv6DualStack: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
} }

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

@ -17,12 +17,10 @@ limitations under the License.
package leadermigration package leadermigration
import ( import (
"k8s.io/apiserver/pkg/util/feature"
"k8s.io/controller-manager/pkg/features"
_ "k8s.io/controller-manager/pkg/features/register" _ "k8s.io/controller-manager/pkg/features/register"
) )
// FeatureEnabled tells if leader migration is enabled through the feature gate. // FeatureEnabled tells if leader migration is enabled through the feature gate.
func FeatureEnabled() bool { func FeatureEnabled() bool {
return feature.DefaultMutableFeatureGate.Enabled(features.ControllerManagerLeaderMigration) return true
} }