Skip to content

K
k3s
Commit 59da8af4 authored by Bobby (Babak) Salamat's avatar Bobby (Babak) Salamat
Browse files
Options

update e2e tests to use scheduling V1 API

parent 1dac6d03
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
test/e2e/apimachinery/resource_quota.go
View file @ 59da8af4
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/api/scheduling/v1beta1" schedulingv1 "k8s.io/api/scheduling/v1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
...@@ -852,7 +852,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() { ...@@ -852,7 +852,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with same priority class.", func() { It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with same priority class.", func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&v1beta1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass1"}, Value: int32(1000)}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass1"}, Value: int32(1000)})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
hard := v1.ResourceList{} hard := v1.ResourceList{}
...@@ -891,7 +891,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() { ...@@ -891,7 +891,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against 2 pods with same priority class.", func() { It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against 2 pods with same priority class.", func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&v1beta1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass2"}, Value: int32(1000)}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass2"}, Value: int32(1000)})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
hard := v1.ResourceList{} hard := v1.ResourceList{}
...@@ -936,7 +936,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() { ...@@ -936,7 +936,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against 2 pods with different priority class.", func() { It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against 2 pods with different priority class.", func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&v1beta1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass3"}, Value: int32(1000)}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass3"}, Value: int32(1000)})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
hard := v1.ResourceList{} hard := v1.ResourceList{}
...@@ -982,10 +982,10 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() { ...@@ -982,10 +982,10 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
}) })
It("should verify ResourceQuota's multiple priority class scope (quota set to pod count: 2) against 2 pods with same priority classes.", func() { It("should verify ResourceQuota's multiple priority class scope (quota set to pod count: 2) against 2 pods with same priority classes.", func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&v1beta1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass5"}, Value: int32(1000)}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass5"}, Value: int32(1000)})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
_, err = f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&v1beta1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass6"}, Value: int32(1000)}) _, err = f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass6"}, Value: int32(1000)})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
hard := v1.ResourceList{} hard := v1.ResourceList{}
...@@ -1037,7 +1037,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() { ...@@ -1037,7 +1037,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with different priority class (ScopeSelectorOpNotIn).", func() { It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with different priority class (ScopeSelectorOpNotIn).", func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&v1beta1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass7"}, Value: int32(1000)}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass7"}, Value: int32(1000)})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
hard := v1.ResourceList{} hard := v1.ResourceList{}
...@@ -1071,7 +1071,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() { ...@@ -1071,7 +1071,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with different priority class (ScopeSelectorOpExists).", func() { It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with different priority class (ScopeSelectorOpExists).", func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&v1beta1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass8"}, Value: int32(1000)}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass8"}, Value: int32(1000)})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
hard := v1.ResourceList{} hard := v1.ResourceList{}
...@@ -1110,7 +1110,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() { ...@@ -1110,7 +1110,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
It("should verify ResourceQuota's priority class scope (cpu, memory quota set) against a pod with same priority class.", func() { It("should verify ResourceQuota's priority class scope (cpu, memory quota set) against a pod with same priority class.", func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&v1beta1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass9"}, Value: int32(1000)}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass9"}, Value: int32(1000)})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
hard := v1.ResourceList{} hard := v1.ResourceList{}
......
test/e2e/autoscaling/cluster_size_autoscaling.go
View file @ 59da8af4
...@@ -31,7 +31,7 @@ import ( ...@@ -31,7 +31,7 @@ import (
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
policy "k8s.io/api/policy/v1beta1" policy "k8s.io/api/policy/v1beta1"
schedulerapi "k8s.io/api/scheduling/v1beta1" schedulerapi "k8s.io/api/scheduling/v1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/fields"
...@@ -1975,7 +1975,7 @@ func createPriorityClasses(f *framework.Framework) func() { ...@@ -1975,7 +1975,7 @@ func createPriorityClasses(f *framework.Framework) func() {
highPriorityClassName: 1000, highPriorityClassName: 1000,
} }
for className, priority := range priorityClasses { for className, priority := range priorityClasses {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: className}, Value: priority}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: className}, Value: priority})
if err != nil { if err != nil {
klog.Errorf("Error creating priority class: %v", err) klog.Errorf("Error creating priority class: %v", err)
} }
...@@ -1984,7 +1984,7 @@ func createPriorityClasses(f *framework.Framework) func() { ...@@ -1984,7 +1984,7 @@ func createPriorityClasses(f *framework.Framework) func() {
return func() { return func() {
for className := range priorityClasses { for className := range priorityClasses {
err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Delete(className, nil) err := f.ClientSet.SchedulingV1().PriorityClasses().Delete(className, nil)
if err != nil { if err != nil {
klog.Errorf("Error deleting priority class: %v", err) klog.Errorf("Error deleting priority class: %v", err)
} }
......
test/e2e/scheduling/preemption.go
View file @ 59da8af4
...@@ -25,7 +25,7 @@ import ( ...@@ -25,7 +25,7 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
schedulerapi "k8s.io/api/scheduling/v1beta1" schedulerapi "k8s.io/api/scheduling/v1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
...@@ -63,7 +63,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { ...@@ -63,7 +63,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
AfterEach(func() { AfterEach(func() {
for _, pair := range priorityPairs { for _, pair := range priorityPairs {
cs.SchedulingV1beta1().PriorityClasses().Delete(pair.name, metav1.NewDeleteOptions(0)) cs.SchedulingV1().PriorityClasses().Delete(pair.name, metav1.NewDeleteOptions(0))
} }
}) })
...@@ -72,7 +72,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { ...@@ -72,7 +72,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
ns = f.Namespace.Name ns = f.Namespace.Name
nodeList = &v1.NodeList{} nodeList = &v1.NodeList{}
for _, pair := range priorityPairs { for _, pair := range priorityPairs {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: pair.name}, Value: pair.value}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: pair.name}, Value: pair.value})
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
} }
...@@ -394,7 +394,7 @@ var _ = SIGDescribe("PreemptionExecutionPath", func() { ...@@ -394,7 +394,7 @@ var _ = SIGDescribe("PreemptionExecutionPath", func() {
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
for _, pair := range priorityPairs { for _, pair := range priorityPairs {
cs.SchedulingV1beta1().PriorityClasses().Delete(pair.name, metav1.NewDeleteOptions(0)) cs.SchedulingV1().PriorityClasses().Delete(pair.name, metav1.NewDeleteOptions(0))
} }
}) })
...@@ -427,7 +427,7 @@ var _ = SIGDescribe("PreemptionExecutionPath", func() { ...@@ -427,7 +427,7 @@ var _ = SIGDescribe("PreemptionExecutionPath", func() {
priorityName := fmt.Sprintf("p%d", i) priorityName := fmt.Sprintf("p%d", i)
priorityVal := int32(i) priorityVal := int32(i)
priorityPairs = append(priorityPairs, priorityPair{name: priorityName, value: priorityVal}) priorityPairs = append(priorityPairs, priorityPair{name: priorityName, value: priorityVal})
_, err := cs.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: priorityName}, Value: priorityVal}) _, err := cs.SchedulingV1().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))
} }
}) })
......
test/e2e_node/eviction_test.go
View file @ 59da8af4
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
"time" "time"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
schedulerapi "k8s.io/api/scheduling/v1beta1" schedulerapi "k8s.io/api/scheduling/v1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
...@@ -302,11 +302,11 @@ var _ = framework.KubeDescribe("PriorityMemoryEvictionOrdering [Slow] [Serial] [ ...@@ -302,11 +302,11 @@ var _ = framework.KubeDescribe("PriorityMemoryEvictionOrdering [Slow] [Serial] [
initialConfig.EvictionMinimumReclaim = map[string]string{} initialConfig.EvictionMinimumReclaim = map[string]string{}
}) })
BeforeEach(func() { BeforeEach(func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority})
Expect(err == nil || errors.IsAlreadyExists(err)).To(BeTrue()) Expect(err == nil || errors.IsAlreadyExists(err)).To(BeTrue())
}) })
AfterEach(func() { AfterEach(func() {
err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Delete(highPriorityClassName, &metav1.DeleteOptions{}) err := f.ClientSet.SchedulingV1().PriorityClasses().Delete(highPriorityClassName, &metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
specs := []podEvictSpec{ specs := []podEvictSpec{
...@@ -359,11 +359,11 @@ var _ = framework.KubeDescribe("PriorityLocalStorageEvictionOrdering [Slow] [Ser ...@@ -359,11 +359,11 @@ var _ = framework.KubeDescribe("PriorityLocalStorageEvictionOrdering [Slow] [Ser
initialConfig.EvictionMinimumReclaim = map[string]string{} initialConfig.EvictionMinimumReclaim = map[string]string{}
}) })
BeforeEach(func() { BeforeEach(func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority})
Expect(err == nil || errors.IsAlreadyExists(err)).To(BeTrue()) Expect(err == nil || errors.IsAlreadyExists(err)).To(BeTrue())
}) })
AfterEach(func() { AfterEach(func() {
err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Delete(highPriorityClassName, &metav1.DeleteOptions{}) err := f.ClientSet.SchedulingV1().PriorityClasses().Delete(highPriorityClassName, &metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
specs := []podEvictSpec{ specs := []podEvictSpec{
...@@ -412,11 +412,11 @@ var _ = framework.KubeDescribe("PriorityPidEvictionOrdering [Slow] [Serial] [Dis ...@@ -412,11 +412,11 @@ var _ = framework.KubeDescribe("PriorityPidEvictionOrdering [Slow] [Serial] [Dis
initialConfig.EvictionMinimumReclaim = map[string]string{} initialConfig.EvictionMinimumReclaim = map[string]string{}
}) })
BeforeEach(func() { BeforeEach(func() {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority})
Expect(err == nil || errors.IsAlreadyExists(err)).To(BeTrue()) Expect(err == nil || errors.IsAlreadyExists(err)).To(BeTrue())
}) })
AfterEach(func() { AfterEach(func() {
err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Delete(highPriorityClassName, &metav1.DeleteOptions{}) err := f.ClientSet.SchedulingV1().PriorityClasses().Delete(highPriorityClassName, &metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
specs := []podEvictSpec{ specs := []podEvictSpec{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment