Skip to content

Commit 9d0a32c

Browse files
authored
Merge pull request kubernetes#85260 from MikeSpreitzer/reqmgmt-rename
Renamed FeatureGate RequestManagement to APIPriorityAndFairness
2 parents d15f2dc + 76d090e commit 9d0a32c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pkg/features/kube_features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
594594
genericfeatures.APIListChunking: {Default: true, PreRelease: featuregate.Beta},
595595
genericfeatures.DryRun: {Default: true, PreRelease: featuregate.Beta},
596596
genericfeatures.ServerSideApply: {Default: true, PreRelease: featuregate.Beta},
597-
genericfeatures.RequestManagement: {Default: false, PreRelease: featuregate.Alpha},
597+
genericfeatures.APIPriorityAndFairness: {Default: false, PreRelease: featuregate.Alpha},
598598

599599
// inherited features from apiextensions-apiserver, relisted here to get a conflict if it is changed
600600
// unintentionally on either side:

staging/src/k8s.io/apiserver/pkg/features/kube_features.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ const (
133133
//
134134
//
135135
// Enables managing request concurrency with prioritization and fairness at each server
136-
RequestManagement featuregate.Feature = "RequestManagement"
136+
APIPriorityAndFairness featuregate.Feature = "APIPriorityAndFairness"
137137

138138
// owner: @wojtek-t
139139
// alpha: v1.16
@@ -163,6 +163,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
163163
WinOverlay: {Default: false, PreRelease: featuregate.Alpha},
164164
WinDSR: {Default: false, PreRelease: featuregate.Alpha},
165165
WatchBookmark: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
166-
RequestManagement: {Default: false, PreRelease: featuregate.Alpha},
166+
APIPriorityAndFairness: {Default: false, PreRelease: featuregate.Alpha},
167167
RemoveSelfLink: {Default: false, PreRelease: featuregate.Alpha},
168168
}

staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ func (s *ServerRunOptions) Validate() []error {
117117
}
118118

119119
if s.EnableInflightQuotaHandler {
120-
if !utilfeature.DefaultFeatureGate.Enabled(features.RequestManagement) {
120+
if !utilfeature.DefaultFeatureGate.Enabled(features.APIPriorityAndFairness) {
121121
errors = append(errors, fmt.Errorf("--enable-inflight-quota-handler can not be set if feature "+
122-
"gate RequestManagement is disabled"))
122+
"gate APIPriorityAndFairness is disabled"))
123123
}
124124
if s.MaxMutatingRequestsInFlight != 0 {
125125
errors = append(errors, fmt.Errorf("--max-mutating-requests-inflight=%v "+

0 commit comments

Comments
 (0)