Skip to content

Commit 30ffa52

Browse files
authored
Merge pull request kubernetes#125846 from tkashem/remove-apf-feature-gate
Remove APF feature gate APIPriorityAndFairness
2 parents fea466e + ae64703 commit 30ffa52

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

pkg/features/kube_features.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,8 +1221,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
12211221

12221222
genericfeatures.APIListChunking: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32
12231223

1224-
genericfeatures.APIPriorityAndFairness: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.31
1225-
12261224
genericfeatures.APIResponseCompression: {Default: true, PreRelease: featuregate.Beta},
12271225

12281226
genericfeatures.APIServerIdentity: {Default: true, PreRelease: featuregate.Beta},

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,6 @@ const (
6969
// all at once.
7070
APIListChunking featuregate.Feature = "APIListChunking"
7171

72-
// owner: @MikeSpreitzer @yue9944882
73-
// alpha: v1.18
74-
// beta: v1.20
75-
// stable: 1.29
76-
//
77-
// Enables managing request concurrency with prioritization and fairness at each server.
78-
// The FeatureGate was introduced in release 1.15 but the feature
79-
// was not really implemented before 1.18.
80-
APIPriorityAndFairness featuregate.Feature = "APIPriorityAndFairness"
81-
8272
// owner: @ilackams
8373
// alpha: v1.7
8474
// beta: v1.16
@@ -362,8 +352,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
362352

363353
APIListChunking: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32
364354

365-
APIPriorityAndFairness: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.31
366-
367355
APIResponseCompression: {Default: true, PreRelease: featuregate.Beta},
368356

369357
APIServerIdentity: {Default: true, PreRelease: featuregate.Beta},

0 commit comments

Comments
 (0)