From 9d5aac1845f1a800c1df0259e1ead1da74cb31db Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Thu, 20 Jun 2019 11:40:47 -0700 Subject: [PATCH] add import-alias for k8s.io/api/scheduling/v1 --- hack/.import-aliases | 3 ++- test/e2e/autoscaling/cluster_size_autoscaling.go | 4 ++-- test/e2e/scheduling/preemption.go | 6 +++--- test/e2e_node/eviction_test.go | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hack/.import-aliases b/hack/.import-aliases index adda70655e1..143dfab9d96 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -26,5 +26,6 @@ "k8s.io/api/policy/v1beta1": "policyv1beta1", "k8s.io/api/rbac/v1": "rbacv1", "k8s.io/api/rbac/v1alpha1": "rbacv1alpha1", - "k8s.io/api/rbac/v1beta1": "rbacv1beta1" + "k8s.io/api/rbac/v1beta1": "rbacv1beta1", + "k8s.io/api/scheduling/v1": "schedulingv1" } \ No newline at end of file diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go index 4a8d2e6572f..e80a4619329 100644 --- a/test/e2e/autoscaling/cluster_size_autoscaling.go +++ b/test/e2e/autoscaling/cluster_size_autoscaling.go @@ -30,7 +30,7 @@ import ( "k8s.io/api/core/v1" policyv1beta1 "k8s.io/api/policy/v1beta1" - schedulerapi "k8s.io/api/scheduling/v1" + schedulingv1 "k8s.io/api/scheduling/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" @@ -1917,7 +1917,7 @@ func createPriorityClasses(f *framework.Framework) func() { highPriorityClassName: 1000, } for className, priority := range priorityClasses { - _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: className}, Value: priority}) + _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: className}, Value: priority}) if err != nil { klog.Errorf("Error creating priority class: %v", err) } diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index 4000855eb80..9bc9d9474c6 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -25,7 +25,7 @@ import ( appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" - schedulerapi "k8s.io/api/scheduling/v1" + schedulingv1 "k8s.io/api/scheduling/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -77,7 +77,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() { ns = f.Namespace.Name nodeList = &v1.NodeList{} for _, pair := range priorityPairs { - _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: pair.name}, Value: pair.value}) + _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: pair.name}, Value: pair.value}) gomega.Expect(err == nil || errors.IsAlreadyExists(err)).To(gomega.Equal(true)) } @@ -451,7 +451,7 @@ var _ = SIGDescribe("PreemptionExecutionPath", func() { priorityName := fmt.Sprintf("p%d", i) priorityVal := int32(i) priorityPairs = append(priorityPairs, priorityPair{name: priorityName, value: priorityVal}) - _, err := cs.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: priorityName}, Value: priorityVal}) + _, err := cs.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: priorityName}, Value: priorityVal}) if err != nil { e2elog.Logf("Failed to create priority '%v/%v': %v", priorityName, priorityVal, err) e2elog.Logf("Reason: %v. Msg: %v", errors.ReasonForError(err), err) diff --git a/test/e2e_node/eviction_test.go b/test/e2e_node/eviction_test.go index f09f36d7bd8..af1c931ac44 100644 --- a/test/e2e_node/eviction_test.go +++ b/test/e2e_node/eviction_test.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/api/core/v1" - schedulerapi "k8s.io/api/scheduling/v1" + schedulingv1 "k8s.io/api/scheduling/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -302,7 +302,7 @@ var _ = framework.KubeDescribe("PriorityMemoryEvictionOrdering [Slow] [Serial] [ initialConfig.EvictionMinimumReclaim = map[string]string{} }) BeforeEach(func() { - _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) + _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) Expect(err == nil || errors.IsAlreadyExists(err)).To(BeTrue()) }) AfterEach(func() { @@ -359,7 +359,7 @@ var _ = framework.KubeDescribe("PriorityLocalStorageEvictionOrdering [Slow] [Ser initialConfig.EvictionMinimumReclaim = map[string]string{} }) BeforeEach(func() { - _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) + _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) Expect(err == nil || errors.IsAlreadyExists(err)).To(BeTrue()) }) AfterEach(func() { @@ -412,7 +412,7 @@ var _ = framework.KubeDescribe("PriorityPidEvictionOrdering [Slow] [Serial] [Dis initialConfig.EvictionMinimumReclaim = map[string]string{} }) BeforeEach(func() { - _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) + _, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: highPriorityClassName}, Value: highPriority}) Expect(err == nil || errors.IsAlreadyExists(err)).To(BeTrue()) }) AfterEach(func() {