github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

apiserver: update borrowing parameters for apf bootstrap objects

Browse Source
This commit is contained in:
Abu Kashem 2022-10-12 12:25:39 -04:00 committed by Mike Spreitzer
parent 424b23bb15
commit 172b27c80c
2 changed files with 122 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap/default.go
View File

@ -170,7 +170,7 @@ var (
Type: flowcontrol.PriorityLevelEnablementLimited,
Limited: &flowcontrol.LimitedPriorityLevelConfiguration{
NominalConcurrencyShares: 30,
LendablePercent: pointer.Int32(0),
LendablePercent: pointer.Int32(33),
LimitResponse: flowcontrol.LimitResponse{
Type: flowcontrol.LimitResponseTypeQueue,
Queuing: &flowcontrol.QueuingConfiguration{
@ -187,7 +187,7 @@ var (
Type: flowcontrol.PriorityLevelEnablementLimited,
Limited: &flowcontrol.LimitedPriorityLevelConfiguration{
NominalConcurrencyShares: 40,
LendablePercent: pointer.Int32(0),
LendablePercent: pointer.Int32(25),
LimitResponse: flowcontrol.LimitResponse{
Type: flowcontrol.LimitResponseTypeQueue,
Queuing: &flowcontrol.QueuingConfiguration{
@ -223,7 +223,7 @@ var (
Type: flowcontrol.PriorityLevelEnablementLimited,
Limited: &flowcontrol.LimitedPriorityLevelConfiguration{
NominalConcurrencyShares: 40,
LendablePercent: pointer.Int32(0),
LendablePercent: pointer.Int32(50),
LimitResponse: flowcontrol.LimitResponse{
Type: flowcontrol.LimitResponseTypeQueue,
Queuing: &flowcontrol.QueuingConfiguration{
@ -241,7 +241,7 @@ var (
Type: flowcontrol.PriorityLevelEnablementLimited,
Limited: &flowcontrol.LimitedPriorityLevelConfiguration{
NominalConcurrencyShares: 100,
LendablePercent: pointer.Int32(0),
LendablePercent: pointer.Int32(90),
LimitResponse: flowcontrol.LimitResponse{
Type: flowcontrol.LimitResponseTypeQueue,
Queuing: &flowcontrol.QueuingConfiguration{
@ -259,7 +259,7 @@ var (
Type: flowcontrol.PriorityLevelEnablementLimited,
Limited: &flowcontrol.LimitedPriorityLevelConfiguration{
NominalConcurrencyShares: 20,
LendablePercent: pointer.Int32(0),
LendablePercent: pointer.Int32(50),
LimitResponse: flowcontrol.LimitResponse{
Type: flowcontrol.LimitResponseTypeQueue,
Queuing: &flowcontrol.QueuingConfiguration{

117
staging/src/k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap/default_test.go Normal file
View File

@ -0,0 +1,117 @@
/*
Copyright 2022 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package bootstrap
import (
"testing"
flowcontrol "k8s.io/api/flowcontrol/v1beta3"
)
func TestBootstrapPriorityLevelConfigurationWithBorrowing(t *testing.T) {
tests := []struct {
name string
nominalSharesExpected int32
lendablePercentexpected int32
}{
{
name: "leader-election",
nominalSharesExpected: 10,
lendablePercentexpected: 0,
},
{
name: "node-high",
nominalSharesExpected: 40,
lendablePercentexpected: 25,
},
{
name: "system",
nominalSharesExpected: 30,
lendablePercentexpected: 33,
},
{
name: "workload-high",
nominalSharesExpected: 40,
lendablePercentexpected: 50,
},
{
name: "workload-low",
nominalSharesExpected: 100,
lendablePercentexpected: 90,
},
{
name: "global-default",
nominalSharesExpected: 20,
lendablePercentexpected: 50,
},
{
name: "catch-all",
nominalSharesExpected: 5,
lendablePercentexpected: 0,
},
}
bootstrapPLs := func() map[string]*flowcontrol.PriorityLevelConfiguration {
list := make([]*flowcontrol.PriorityLevelConfiguration, 0)
list = append(list, MandatoryPriorityLevelConfigurations...)
list = append(list, SuggestedPriorityLevelConfigurations...)
m := map[string]*flowcontrol.PriorityLevelConfiguration{}
for i := range list {
m[list[i].Name] = list[i]
}
return m
}()
for _, test := range tests {
bootstrapPL := bootstrapPLs[test.name]
if bootstrapPL == nil {
t.Errorf("Expected bootstrap PriorityLevelConfiguration %q, but not found in bootstrap configuration", test.name)
continue
}
delete(bootstrapPLs, test.name)
if bootstrapPL.Spec.Type != flowcontrol.PriorityLevelEnablementLimited {
t.Errorf("bootstrap PriorityLevelConfiguration %q is not %q", test.name, flowcontrol.PriorityLevelEnablementLimited)
continue
}
if test.nominalSharesExpected != bootstrapPL.Spec.Limited.NominalConcurrencyShares {
t.Errorf("bootstrap PriorityLevelConfiguration %q: expected NominalConcurrencyShares: %d, but got: %d", test.name, test.nominalSharesExpected, bootstrapPL.Spec.Limited.NominalConcurrencyShares)
}
if test.lendablePercentexpected != *bootstrapPL.Spec.Limited.LendablePercent {
t.Errorf("bootstrap PriorityLevelConfiguration %q: expected NominalConcurrencyShares: %d, but got: %d", test.name, test.lendablePercentexpected, bootstrapPL.Spec.Limited.LendablePercent)
}
if bootstrapPL.Spec.Limited.BorrowingLimitPercent != nil {
t.Errorf("bootstrap PriorityLevelConfiguration %q: expected BorrowingLimitPercent to be nil, but got: %d", test.name, *bootstrapPL.Spec.Limited.BorrowingLimitPercent)
}
}
if len(bootstrapPLs) != 0 {
names := make([]string, 0)
for name, bpl := range bootstrapPLs {
if bpl.Spec.Type == flowcontrol.PriorityLevelEnablementExempt {
t.Logf("bootstrap PriorityLevelConfiguration %q is of %q type, skipped", name, flowcontrol.PriorityLevelConfigurationNameExempt)
continue
}
names = append(names, name)
}
if len(names) != 0 {
t.Errorf("bootstrap PriorityLevelConfiguration objects not accounted by this test: %v", names)
}
}
}