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

Deflake a preemption test that may patch Node incorrectly

Browse Source
This commit is contained in:
Wei Huang 2022-12-07 14:30:34 -08:00
parent 86f3fa94f1
commit a75c0709d0
No known key found for this signature in database
GPG Key ID: 17AFE05D01EA77B2
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/scheduling/preemption.go
View File

@ -88,6 +88,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
for _, node := range nodeList.Items { for _, node := range nodeList.Items {
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
delete(nodeCopy.Status.Capacity, testExtendedResource) delete(nodeCopy.Status.Capacity, testExtendedResource)
delete(nodeCopy.Status.Allocatable, testExtendedResource)
err := patchNode(cs, &node, nodeCopy) err := patchNode(cs, &node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
@ -138,6 +139,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
// Update each node to advertise 3 available extended resources // Update each node to advertise 3 available extended resources
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5") nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5")
nodeCopy.Status.Allocatable[testExtendedResource] = resource.MustParse("5")
err := patchNode(cs, &node, nodeCopy) err := patchNode(cs, &node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -228,6 +230,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
// Update each node to advertise 3 available extended resources // Update each node to advertise 3 available extended resources
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5") nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5")
nodeCopy.Status.Allocatable[testExtendedResource] = resource.MustParse("5")
err := patchNode(cs, &node, nodeCopy) err := patchNode(cs, &node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -329,6 +332,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
node := nodeList.Items[0] node := nodeList.Items[0]
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("1") nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("1")
nodeCopy.Status.Allocatable[testExtendedResource] = resource.MustParse("1")
err := patchNode(cs, &node, nodeCopy) err := patchNode(cs, &node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -408,6 +412,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
ginkgo.By(fmt.Sprintf("Apply 10 fake resource to node %v.", node.Name)) ginkgo.By(fmt.Sprintf("Apply 10 fake resource to node %v.", node.Name))
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
nodeCopy.Status.Capacity[fakeRes] = resource.MustParse("10") nodeCopy.Status.Capacity[fakeRes] = resource.MustParse("10")
nodeCopy.Status.Allocatable[fakeRes] = resource.MustParse("10")
err = patchNode(cs, node, nodeCopy) err = patchNode(cs, node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
nodes = append(nodes, node) nodes = append(nodes, node)
@ -420,6 +425,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
for _, node := range nodes { for _, node := range nodes {
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
delete(nodeCopy.Status.Capacity, fakeRes) delete(nodeCopy.Status.Capacity, fakeRes)
delete(nodeCopy.Status.Allocatable, fakeRes)
err := patchNode(cs, node, nodeCopy) err := patchNode(cs, node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
@ -558,6 +564,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
if node != nil { if node != nil {
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
delete(nodeCopy.Status.Capacity, fakecpu) delete(nodeCopy.Status.Capacity, fakecpu)
delete(nodeCopy.Status.Allocatable, fakecpu)
err := patchNode(cs, node, nodeCopy) err := patchNode(cs, node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
@ -590,6 +597,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
// update Node API object with a fake resource // update Node API object with a fake resource
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
nodeCopy.Status.Capacity[fakecpu] = resource.MustParse("1000") nodeCopy.Status.Capacity[fakecpu] = resource.MustParse("1000")
nodeCopy.Status.Allocatable[fakecpu] = resource.MustParse("1000")
err = patchNode(cs, node, nodeCopy) err = patchNode(cs, node, nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)