Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(scheduler): cleanup some minor issues in testing #113505

Merged
merged 1 commit into from Nov 3, 2022
Merged

chore(scheduler): cleanup some minor issues in testing #113505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions pkg/scheduler/framework/plugins/noderesources/fit_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down
16 changes: 2 additions & 14 deletions pkg/scheduler/framework/plugins/noderesources/least_allocated_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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,
},
}

Expand Down
17 changes: 3 additions & 14 deletions pkg/scheduler/framework/plugins/noderesources/most_allocated_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}},
},
Expand All @@ -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}},
},
Expand Down
7 changes: 1 addition & 6 deletions pkg/scheduler/framework/plugins/noderesources/requested_to_capacity_ratio_test.go
View file
Open in desktop
Expand Up @@ -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},
Expand Down Expand Up @@ -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)
}
})
}
Expand Down
11 changes: 11 additions & 0 deletions pkg/scheduler/framework/plugins/noderesources/test_util.go
View file
Open in desktop
Expand Up @@ -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 {
Expand Down