From 76d090e30f917888c5882228f7261ed31a34a2ab Mon Sep 17 00:00:00 2001 From: Mike Spreitzer Date: Thu, 14 Nov 2019 01:34:59 -0500 Subject: [PATCH] Renamed FeatureGate RequestManagement to APIPriorityAndFairness The old name is too broad, we wanted a name that is more specific to the actual feature. This is an alpha gate, and no release has yet associated any functionality with this gate. --- pkg/features/kube_features.go | 2 +- staging/src/k8s.io/apiserver/pkg/features/kube_features.go | 4 ++-- .../k8s.io/apiserver/pkg/server/options/server_run_options.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 53e5c87a162..fd1359e87d9 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -594,7 +594,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.APIListChunking: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.DryRun: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.ServerSideApply: {Default: true, PreRelease: featuregate.Beta}, - genericfeatures.RequestManagement: {Default: false, PreRelease: featuregate.Alpha}, + genericfeatures.APIPriorityAndFairness: {Default: false, PreRelease: featuregate.Alpha}, // inherited features from apiextensions-apiserver, relisted here to get a conflict if it is changed // unintentionally on either side: diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index e1505c7b5a7..8f40751a38f 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -133,7 +133,7 @@ const ( // // // Enables managing request concurrency with prioritization and fairness at each server - RequestManagement featuregate.Feature = "RequestManagement" + APIPriorityAndFairness featuregate.Feature = "APIPriorityAndFairness" // owner: @wojtek-t // alpha: v1.16 @@ -163,6 +163,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS WinOverlay: {Default: false, PreRelease: featuregate.Alpha}, WinDSR: {Default: false, PreRelease: featuregate.Alpha}, WatchBookmark: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - RequestManagement: {Default: false, PreRelease: featuregate.Alpha}, + APIPriorityAndFairness: {Default: false, PreRelease: featuregate.Alpha}, RemoveSelfLink: {Default: false, PreRelease: featuregate.Alpha}, } diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go index cfc35ef2a73..dde1a8f1262 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go @@ -117,9 +117,9 @@ func (s *ServerRunOptions) Validate() []error { } if s.EnableInflightQuotaHandler { - if !utilfeature.DefaultFeatureGate.Enabled(features.RequestManagement) { + if !utilfeature.DefaultFeatureGate.Enabled(features.APIPriorityAndFairness) { errors = append(errors, fmt.Errorf("--enable-inflight-quota-handler can not be set if feature "+ - "gate RequestManagement is disabled")) + "gate APIPriorityAndFairness is disabled")) } if s.MaxMutatingRequestsInFlight != 0 { errors = append(errors, fmt.Errorf("--max-mutating-requests-inflight=%v "+