From db3ec322d73db5c49cf5a96f4d41e59e3077e7da Mon Sep 17 00:00:00 2001 From: Jiahui Feng Date: Mon, 28 Mar 2022 09:27:49 -0700 Subject: [PATCH] mark ControllerManagerLeaderMigration as GA. --- pkg/features/kube_features.go | 3 ++- .../k8s.io/controller-manager/pkg/features/kube_features.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 76b1abb9173..9ada4c94f72 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -760,6 +760,7 @@ const ( // 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" @@ -969,7 +970,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha}, MemoryQoS: {Default: false, PreRelease: featuregate.Alpha}, CPUManagerPolicyOptions: {Default: true, PreRelease: featuregate.Beta}, - ControllerManagerLeaderMigration: {Default: true, PreRelease: featuregate.Beta}, + ControllerManagerLeaderMigration: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26 CPUManagerPolicyAlphaOptions: {Default: false, PreRelease: featuregate.Alpha}, CPUManagerPolicyBetaOptions: {Default: true, PreRelease: featuregate.Beta}, JobMutableNodeSchedulingDirectives: {Default: true, PreRelease: featuregate.Beta}, 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 a26686c36cc..d39713d1b3b 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 @@ -37,6 +37,7 @@ const ( // 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 @@ -51,5 +52,5 @@ func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.Mutable // 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{ IPv6DualStack: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - ControllerManagerLeaderMigration: {Default: true, PreRelease: featuregate.Beta}, + ControllerManagerLeaderMigration: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26 }