-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add MaxNodeUtilizationPercent in ReclaimedResourceConfiguration
- Loading branch information
Showing
10 changed files
with
225 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
pkg/config/agent/dynamic/adminqos/reclaimedresource/reclaimedresource_base_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| /* | ||
| Copyright 2022 The Katalyst 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 reclaimedresource | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| v1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| ) | ||
|
|
||
| func TestGetReservedResourceForAllocate(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| for _, tc := range []struct { | ||
| name string | ||
| config *ReclaimedResourceConfiguration | ||
| nodeResourceList v1.ResourceList | ||
| expectRes v1.ResourceList | ||
| }{ | ||
| { | ||
| name: "MaxNodeUtilizationPercent not set", | ||
| config: &ReclaimedResourceConfiguration{ | ||
| ReservedResourceForAllocate: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("4"), | ||
| v1.ResourceMemory: resource.MustParse("8Gi"), | ||
| }, | ||
| }, | ||
| nodeResourceList: map[v1.ResourceName]resource.Quantity{}, | ||
| expectRes: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("4"), | ||
| v1.ResourceMemory: resource.MustParse("8Gi"), | ||
| }, | ||
| }, | ||
| { | ||
| name: "MaxNodeUtilizationPercent set, only get cpu", | ||
| config: &ReclaimedResourceConfiguration{ | ||
| ReservedResourceForAllocate: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("4"), | ||
| v1.ResourceMemory: resource.MustParse("8Gi"), | ||
| }, | ||
| MaxNodeUtilizationPercent: map[v1.ResourceName]int64{ | ||
| v1.ResourceCPU: 60, | ||
| v1.ResourceMemory: 80, | ||
| }, | ||
| }, | ||
| nodeResourceList: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("32"), | ||
| }, | ||
| expectRes: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("12800m"), | ||
| v1.ResourceMemory: resource.MustParse("8Gi"), | ||
| }, | ||
| }, | ||
| { | ||
| name: "MaxNodeUtilizationPercent set, only get memory", | ||
| config: &ReclaimedResourceConfiguration{ | ||
| ReservedResourceForAllocate: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("4"), | ||
| v1.ResourceMemory: resource.MustParse("8Gi"), | ||
| }, | ||
| MaxNodeUtilizationPercent: map[v1.ResourceName]int64{ | ||
| v1.ResourceCPU: 60, | ||
| v1.ResourceMemory: 80, | ||
| }, | ||
| }, | ||
| nodeResourceList: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceMemory: resource.MustParse("100Gi"), | ||
| }, | ||
| expectRes: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("4"), | ||
| v1.ResourceMemory: resource.MustParse("20Gi"), | ||
| }, | ||
| }, | ||
| { | ||
| name: "MaxNodeUtilizationPercent only cpu set", | ||
| config: &ReclaimedResourceConfiguration{ | ||
| ReservedResourceForAllocate: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("4"), | ||
| v1.ResourceMemory: resource.MustParse("8Gi"), | ||
| }, | ||
| MaxNodeUtilizationPercent: map[v1.ResourceName]int64{ | ||
| v1.ResourceMemory: 80, | ||
| }, | ||
| }, | ||
| nodeResourceList: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("32"), | ||
| }, | ||
| expectRes: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("4"), | ||
| v1.ResourceMemory: resource.MustParse("8Gi"), | ||
| }, | ||
| }, | ||
| { | ||
| name: "MaxNodeUtilizationPercent value not supported", | ||
| config: &ReclaimedResourceConfiguration{ | ||
| ReservedResourceForAllocate: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("4"), | ||
| v1.ResourceMemory: resource.MustParse("8Gi"), | ||
| }, | ||
| MaxNodeUtilizationPercent: map[v1.ResourceName]int64{ | ||
| v1.ResourceCPU: 120, | ||
| v1.ResourceMemory: 0, | ||
| }, | ||
| }, | ||
| nodeResourceList: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("32"), | ||
| v1.ResourceMemory: resource.MustParse("100Gi"), | ||
| }, | ||
| expectRes: map[v1.ResourceName]resource.Quantity{ | ||
| v1.ResourceCPU: resource.MustParse("4"), | ||
| v1.ResourceMemory: resource.MustParse("8Gi"), | ||
| }, | ||
| }, | ||
| } { | ||
| tc := tc | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| res := tc.config.GetReservedResourceForAllocate(tc.nodeResourceList) | ||
| assert.Equal(t, len(tc.expectRes), len(res)) | ||
| for resource, quantity := range res { | ||
| expectQuan, ok := tc.expectRes[resource] | ||
| assert.True(t, ok) | ||
|
|
||
| assert.True(t, quantity.Equal(expectQuan)) | ||
| } | ||
| }) | ||
| } | ||
| } |