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

Update PriorityClass conformance test to cover DeleteCollection

Browse Source
This commit is contained in:
Wei Huang 2020-10-28 15:34:35 -07:00
parent 8bc8b11bcf
commit 6ccbd3c9a9
No known key found for this signature in database
GPG Key ID: BE5E9752F8B6E005
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/scheduling/BUILD
View File

@ -58,6 +58,7 @@ go_library(
"//test/e2e/framework/testfiles:go_default_library", "//test/e2e/framework/testfiles:go_default_library",
"//test/utils:go_default_library", "//test/utils:go_default_library",
"//test/utils/image:go_default_library", "//test/utils/image:go_default_library",
"//vendor/github.com/google/uuid:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library",

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

@ -24,6 +24,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/google/uuid"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
schedulingv1 "k8s.io/api/scheduling/v1" schedulingv1 "k8s.io/api/scheduling/v1"
@ -672,6 +673,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
ginkgo.Context("PriorityClass endpoints", func() { ginkgo.Context("PriorityClass endpoints", func() {
var cs clientset.Interface var cs clientset.Interface
f := framework.NewDefaultFramework("sched-preemption-path") f := framework.NewDefaultFramework("sched-preemption-path")
testUUID := uuid.New().String()
var pcs []*schedulingv1.PriorityClass var pcs []*schedulingv1.PriorityClass
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {
@ -679,7 +681,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
// Create 2 PriorityClass: p1, p2. // Create 2 PriorityClass: p1, p2.
for i := 1; i <= 2; i++ { for i := 1; i <= 2; i++ {
name, val := fmt.Sprintf("p%d", i), int32(i) name, val := fmt.Sprintf("p%d", i), int32(i)
pc, err := cs.SchedulingV1().PriorityClasses().Create(context.TODO(), &schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: name}, Value: val}, metav1.CreateOptions{}) pc, err := cs.SchedulingV1().PriorityClasses().Create(context.TODO(), &schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: name, Labels: map[string]string{"e2e": testUUID}}, Value: val}, metav1.CreateOptions{})
if err != nil { if err != nil {
framework.Logf("Failed to create priority '%v/%v'. Reason: %v. Msg: %v", name, val, apierrors.ReasonForError(err), err) framework.Logf("Failed to create priority '%v/%v'. Reason: %v. Msg: %v", name, val, apierrors.ReasonForError(err), err)
} }
@ -703,11 +705,9 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
} }
} }
// Cannot run collection deletion which would delete all system level priority classes. // Collection deletion on created PriorityClasses.
for _, pc := range pcs { err := cs.SchedulingV1().PriorityClasses().DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: fmt.Sprintf("e2e=%v", testUUID)})
err := cs.SchedulingV1().PriorityClasses().Delete(context.TODO(), pc.Name, *metav1.NewDeleteOptions(0)) framework.ExpectNoError(err)
framework.ExpectNoError(err)
}
}) })
/* /*