github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

apiserver: set APF featuregate to ga

Browse Source
This commit is contained in:
Abu Kashem
2023-10-31 08:35:52 -04:00
parent 84fb7b5ce0
commit c7fcef1875
10 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controlplane/apiserver/options/validation.go
View File

@@ -51,7 +51,7 @@ func validateTokenRequest(options *Options) []error {
}
func validateAPIPriorityAndFairness(options *Options) []error {
if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.APIPriorityAndFairness) && options.Features.EnablePriorityAndFairness {
if options.Features.EnablePriorityAndFairness {
// If none of the following runtime config options are specified,
// APF is assumed to be turned on. The internal APF controller uses
// v1 so it should be enabled.
@@ -59,7 +59,7 @@ func validateAPIPriorityAndFairness(options *Options) []error {
testConfigs := []string{"flowcontrol.apiserver.k8s.io/v1", "api/ga", "api/all"} // in the order of precedence
for _, testConfig := range testConfigs {
if strings.Contains(enabledAPIString, fmt.Sprintf("%s=false", testConfig)) {
return []error{fmt.Errorf("--runtime-config=%s=false conflicts with --enable-priority-and-fairness=true and --feature-gates=APIPriorityAndFairness=true", testConfig)}
return []error{fmt.Errorf("--runtime-config=%s=false conflicts with --enable-priority-and-fairness=true", testConfig)}
}
if strings.Contains(enabledAPIString, fmt.Sprintf("%s=true", testConfig)) {
return nil

2
pkg/controlplane/apiserver/options/validation_test.go
View File

@@ -33,7 +33,7 @@ import (
)
func TestValidateAPIPriorityAndFairness(t *testing.T) {
const conflict = "conflicts with --enable-priority-and-fairness=true and --feature-gates=APIPriorityAndFairness=true"
const conflict = "conflicts with --enable-priority-and-fairness=true"
tests := []struct {
runtimeConfig string
errShouldContain string