kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85260 from MikeSpreitzer/reqmgmt-rename 

Renamed FeatureGate RequestManagement to APIPriorityAndFairness

Kubernetes-commit: 9d0a32caf8bf9f2fdc31ee586938bdbaba64fab4
This commit is contained in:
Kubernetes Publisher 2019-11-14 17:51:10 -08:00
parent 2d4fff0118 b017e16e12
commit ccb472b74e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/features/kube_features.go
View File

@ -133,7 +133,7 @@ const (
// //
// //
// Enables managing request concurrency with prioritization and fairness at each server // Enables managing request concurrency with prioritization and fairness at each server
RequestManagement featuregate.Feature = "RequestManagement" APIPriorityAndFairness featuregate.Feature = "APIPriorityAndFairness"
// owner: @wojtek-t // owner: @wojtek-t
// alpha: v1.16 // alpha: v1.16
@ -163,6 +163,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
WinOverlay: {Default: false, PreRelease: featuregate.Alpha}, WinOverlay: {Default: false, PreRelease: featuregate.Alpha},
WinDSR: {Default: false, PreRelease: featuregate.Alpha}, WinDSR: {Default: false, PreRelease: featuregate.Alpha},
WatchBookmark: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, 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}, RemoveSelfLink: {Default: false, PreRelease: featuregate.Alpha},
} }

4
pkg/server/options/server_run_options.go
View File

@ -117,9 +117,9 @@ func (s *ServerRunOptions) Validate() []error {
} }
if s.EnableInflightQuotaHandler { 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 "+ 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 { if s.MaxMutatingRequestsInFlight != 0 {
errors = append(errors, fmt.Errorf("--max-mutating-requests-inflight=%v "+ errors = append(errors, fmt.Errorf("--max-mutating-requests-inflight=%v "+