mirror of
https://github.com/kubernetes-sigs/descheduler.git
synced 2026-01-26 05:14:13 +01:00
refactor(TestDefaultEvictor): add setNodeTaint helper function
This commit is contained in:
@@ -77,6 +77,16 @@ func TestDefaultEvictorPreEvictionFilter(t *testing.T) {
|
|||||||
nodeLabelKey := "datacenter"
|
nodeLabelKey := "datacenter"
|
||||||
nodeLabelValue := "east"
|
nodeLabelValue := "east"
|
||||||
|
|
||||||
|
setNodeTaint := func(node *v1.Node) {
|
||||||
|
node.Spec.Taints = []v1.Taint{
|
||||||
|
{
|
||||||
|
Key: nodeTaintKey,
|
||||||
|
Value: nodeTaintValue,
|
||||||
|
Effect: v1.TaintEffectNoSchedule,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
testCases := []testCase{
|
testCases := []testCase{
|
||||||
{
|
{
|
||||||
description: "Pod with no tolerations running on normal node, all other nodes tainted",
|
description: "Pod with no tolerations running on normal node, all other nodes tainted",
|
||||||
@@ -86,24 +96,8 @@ func TestDefaultEvictorPreEvictionFilter(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
nodes: []*v1.Node{
|
nodes: []*v1.Node{
|
||||||
buildTestNode("node2", func(node *v1.Node) {
|
buildTestNode("node2", setNodeTaint),
|
||||||
node.Spec.Taints = []v1.Taint{
|
buildTestNode("node3", setNodeTaint),
|
||||||
{
|
|
||||||
Key: nodeTaintKey,
|
|
||||||
Value: nodeTaintValue,
|
|
||||||
Effect: v1.TaintEffectNoSchedule,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
buildTestNode("node3", func(node *v1.Node) {
|
|
||||||
node.Spec.Taints = []v1.Taint{
|
|
||||||
{
|
|
||||||
Key: nodeTaintKey,
|
|
||||||
Value: nodeTaintValue,
|
|
||||||
Effect: v1.TaintEffectNoSchedule,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
},
|
},
|
||||||
nodeFit: true,
|
nodeFit: true,
|
||||||
}, {
|
}, {
|
||||||
@@ -121,24 +115,8 @@ func TestDefaultEvictorPreEvictionFilter(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
nodes: []*v1.Node{
|
nodes: []*v1.Node{
|
||||||
buildTestNode("node2", func(node *v1.Node) {
|
buildTestNode("node2", setNodeTaint),
|
||||||
node.Spec.Taints = []v1.Taint{
|
buildTestNode("node3", setNodeTaint),
|
||||||
{
|
|
||||||
Key: nodeTaintKey,
|
|
||||||
Value: nodeTaintValue,
|
|
||||||
Effect: v1.TaintEffectNoSchedule,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
buildTestNode("node3", func(node *v1.Node) {
|
|
||||||
node.Spec.Taints = []v1.Taint{
|
|
||||||
{
|
|
||||||
Key: nodeTaintKey,
|
|
||||||
Value: nodeTaintValue,
|
|
||||||
Effect: v1.TaintEffectNoSchedule,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
},
|
},
|
||||||
nodeFit: true,
|
nodeFit: true,
|
||||||
result: true,
|
result: true,
|
||||||
@@ -330,8 +308,15 @@ func TestDefaultEvictorFilter(t *testing.T) {
|
|||||||
|
|
||||||
minPodAge := metav1.Duration{Duration: 50 * time.Minute}
|
minPodAge := metav1.Duration{Duration: 50 * time.Minute}
|
||||||
|
|
||||||
nodeTaintKey := "hardware"
|
setNodeTaint := func(node *v1.Node) {
|
||||||
nodeTaintValue := "gpu"
|
node.Spec.Taints = []v1.Taint{
|
||||||
|
{
|
||||||
|
Key: "hardware",
|
||||||
|
Value: "gpu",
|
||||||
|
Effect: v1.TaintEffectNoSchedule,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ownerRefUUID := uuid.NewUUID()
|
ownerRefUUID := uuid.NewUUID()
|
||||||
|
|
||||||
@@ -645,24 +630,8 @@ func TestDefaultEvictorFilter(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
nodes: []*v1.Node{
|
nodes: []*v1.Node{
|
||||||
buildTestNode("node2", func(node *v1.Node) {
|
buildTestNode("node2", setNodeTaint),
|
||||||
node.Spec.Taints = []v1.Taint{
|
buildTestNode("node3", setNodeTaint),
|
||||||
{
|
|
||||||
Key: nodeTaintKey,
|
|
||||||
Value: nodeTaintValue,
|
|
||||||
Effect: v1.TaintEffectNoSchedule,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
buildTestNode("node3", func(node *v1.Node) {
|
|
||||||
node.Spec.Taints = []v1.Taint{
|
|
||||||
{
|
|
||||||
Key: nodeTaintKey,
|
|
||||||
Value: nodeTaintValue,
|
|
||||||
Effect: v1.TaintEffectNoSchedule,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
},
|
},
|
||||||
nodeFit: true,
|
nodeFit: true,
|
||||||
result: true,
|
result: true,
|
||||||
|
|||||||
Reference in New Issue
Block a user