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

Merge pull request #113505 from Abirdcfly/fixcomment

Browse Source 
chore(scheduler): cleanup some minor issues in testing
This commit is contained in:
Kubernetes Prow Robot 2022-11-02 21:40:19 -07:00 committed by GitHub
commit 1d2e804287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/scheduler/framework/plugins/noderesources/fit_test.go
View File

@ -645,11 +645,6 @@ func TestStorageRequests(t *testing.T) {
}
func TestFitScore(t *testing.T) {
defaultResources := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1},
}
tests := []struct {
name string
requestedPod *v1.Pod

16
pkg/scheduler/framework/plugins/noderesources/least_allocated_test.go
View File

@ -32,18 +32,6 @@ import (
)
func TestLeastAllocatedScoringStrategy(t *testing.T) {
defaultResources := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1},
}
extendedRes := "abc.com/xyz"
extendedResourceLeastAllocatedSet := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1},
{Name: extendedRes, Weight: 1},
}
tests := []struct {
name string
requestedPod *v1.Pod
@ -347,7 +335,7 @@ func TestLeastAllocatedScoringStrategy(t *testing.T) {
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "4"}).Obj(),
},
expectedScores: []framework.NodeScore{{Name: "node1", Score: 50}, {Name: "node2", Score: 50}},
resources: extendedResourceLeastAllocatedSet,
resources: extendedResourceSet,
},
{
// Honor extended resource if the pod requests.
@ -368,7 +356,7 @@ func TestLeastAllocatedScoringStrategy(t *testing.T) {
},
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: 50}, {Name: "node2", Score: 60}},
resources: extendedResourceLeastAllocatedSet,
resources: extendedResourceSet,
},
}

17
pkg/scheduler/framework/plugins/noderesources/most_allocated_test.go
View File

@ -32,17 +32,6 @@ import (
)
func TestMostAllocatedScoringStrategy(t *testing.T) {
defaultResources := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1},
}
extendedRes := "abc.com/xyz"
extendedResourceLeastAllocatedSet := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1},
{Name: extendedRes, Weight: 1},
}
tests := []struct {
name string
requestedPod *v1.Pod
@ -75,7 +64,7 @@ func TestMostAllocatedScoringStrategy(t *testing.T) {
// Node1 scores on 0-MaxNodeScore scale
// CPU Score: (3000 * MaxNodeScore) / 4000 = 75
// Memory Score: (5000 * MaxNodeScore) / 10000 = 50
// Node1 Score: (75 + 50) / 2 = 6
// Node1 Score: (75 + 50) / 2 = 62
// Node2 scores on 0-MaxNodeScore scale
// CPU Score: (3000 * MaxNodeScore) / 6000 = 50
// Memory Score: (5000 * MaxNodeScore) / 10000 = 50
@ -301,7 +290,7 @@ func TestMostAllocatedScoringStrategy(t *testing.T) {
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "4"}).Obj(),
},
resources: extendedResourceLeastAllocatedSet,
resources: extendedResourceSet,
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: 50}, {Name: "node2", Score: 50}},
},
@ -322,7 +311,7 @@ func TestMostAllocatedScoringStrategy(t *testing.T) {
st.MakeNode().Name("node1").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "4"}).Obj(),
st.MakeNode().Name("node2").Capacity(map[v1.ResourceName]string{"cpu": "6000", "memory": "10000", v1.ResourceName(extendedRes): "10"}).Obj(),
},
resources: extendedResourceLeastAllocatedSet,
resources: extendedResourceSet,
existingPods: nil,
expectedScores: []framework.NodeScore{{Name: "node1", Score: 50}, {Name: "node2", Score: 40}},
},

7
pkg/scheduler/framework/plugins/noderesources/requested_to_capacity_ratio_test.go
View File

@ -36,11 +36,6 @@ import (
)
func TestRequestedToCapacityRatioScoringStrategy(t *testing.T) {
defaultResources := []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1},
}
shape := []config.UtilizationShapePoint{
{Utilization: 0, Score: 10},
{Utilization: 100, Score: 0},
@ -208,7 +203,7 @@ func TestBrokenLinearFunction(t *testing.T) {
t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) {
function := helper.BuildBrokenLinearFunction(test.points)
for _, assertion := range test.assertions {
assert.InDelta(t, assertion.expected, function(assertion.p), 0.1, "points=%v, p=%f", test.points, assertion.p)
assert.InDelta(t, assertion.expected, function(assertion.p), 0.1, "points=%v, p=%d", test.points, assertion.p)
}
})
}

11
pkg/scheduler/framework/plugins/noderesources/test_util.go
View File

@ -22,10 +22,21 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/scheduler/apis/config"
)
var (
ignoreBadValueDetail = cmpopts.IgnoreFields(field.Error{}, "BadValue", "Detail")
defaultResources = []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1},
}
extendedRes = "abc.com/xyz"
extendedResourceSet = []config.ResourceSpec{
{Name: string(v1.ResourceCPU), Weight: 1},
{Name: string(v1.ResourceMemory), Weight: 1},
{Name: extendedRes, Weight: 1},
}
)
func makeNode(node string, milliCPU, memory int64, extendedResource map[string]int64) *v1.Node {