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

cleanup PriorityClass after each test

Browse Source
This commit is contained in:
Wei Huang 2018-11-20 11:00:26 -08:00
parent c1e7ab07bd
commit 4ce10eda64
No known key found for this signature in database
GPG Key ID: BE5E9752F8B6E005
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,11 @@ import (
_ "github.com/stretchr/testify/assert" _ "github.com/stretchr/testify/assert"
) )
type priorityPair struct {
name string
value int32
}
var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
var cs clientset.Interface var cs clientset.Interface
var nodeList *v1.NodeList var nodeList *v1.NodeList
@ -50,24 +55,31 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
lowPriorityClassName := f.BaseName + "-low-priority" lowPriorityClassName := f.BaseName + "-low-priority"
mediumPriorityClassName := f.BaseName + "-medium-priority" mediumPriorityClassName := f.BaseName + "-medium-priority"
highPriorityClassName := f.BaseName + "-high-priority" highPriorityClassName := f.BaseName + "-high-priority"
priorityPairs := []priorityPair{
{name: lowPriorityClassName, value: lowPriority},
{name: mediumPriorityClassName, value: mediumPriority},
{name: highPriorityClassName, value: highPriority},
}
AfterEach(func() { AfterEach(func() {
for _, pair := range priorityPairs {
cs.SchedulingV1beta1().PriorityClasses().Delete(pair.name, metav1.NewDeleteOptions(0))
}
}) })
BeforeEach(func() { BeforeEach(func() {
cs = f.ClientSet cs = f.ClientSet
ns = f.Namespace.Name ns = f.Namespace.Name
nodeList = &v1.NodeList{} nodeList = &v1.NodeList{}
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) for _, pair := range priorityPairs {
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) _, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: pair.name}, Value: pair.value})
_, err = f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: mediumPriorityClassName}, Value: mediumPriority}) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) }
_, err = f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: lowPriorityClassName}, Value: lowPriority})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
framework.WaitForAllNodesHealthy(cs, time.Minute) framework.WaitForAllNodesHealthy(cs, time.Minute)
masterNodes, nodeList = framework.GetMasterAndWorkerNodesOrDie(cs) masterNodes, nodeList = framework.GetMasterAndWorkerNodesOrDie(cs)
err = framework.CheckTestingNSDeletedExcept(cs, ns) err := framework.CheckTestingNSDeletedExcept(cs, ns)
framework.ExpectNoError(err) framework.ExpectNoError(err)
}) })
@ -370,6 +382,8 @@ var _ = SIGDescribe("PreemptionExecutionPath", func() {
var ns string var ns string
f := framework.NewDefaultFramework("sched-preemption-path") f := framework.NewDefaultFramework("sched-preemption-path")
priorityPairs := make([]priorityPair, 0)
AfterEach(func() { AfterEach(func() {
if node != nil { if node != nil {
nodeCopy := node.DeepCopy() nodeCopy := node.DeepCopy()
@ -379,6 +393,9 @@ var _ = SIGDescribe("PreemptionExecutionPath", func() {
_, err := cs.CoreV1().Nodes().UpdateStatus(nodeCopy) _, err := cs.CoreV1().Nodes().UpdateStatus(nodeCopy)
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
for _, pair := range priorityPairs {
cs.SchedulingV1beta1().PriorityClasses().Delete(pair.name, metav1.NewDeleteOptions(0))
}
}) })
BeforeEach(func() { BeforeEach(func() {
@ -408,7 +425,9 @@ var _ = SIGDescribe("PreemptionExecutionPath", func() {
// create four PriorityClass: p1, p2, p3, p4 // create four PriorityClass: p1, p2, p3, p4
for i := 1; i <= 4; i++ { for i := 1; i <= 4; i++ {
priorityName := fmt.Sprintf("p%d", i) priorityName := fmt.Sprintf("p%d", i)
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: priorityName}, Value: int32(i)}) priorityVal := int32(i)
priorityPairs = append(priorityPairs, priorityPair{name: priorityName, value: priorityVal})
_, err := cs.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: priorityName}, Value: priorityVal})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
} }
}) })