From 18ffaf560843e764ef47c147a59b158d0baffb17 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Tue, 25 Feb 2020 14:50:30 -0500 Subject: [PATCH] Move scheduler extender API V1 to staging k8s.io/kube-scheduler --- pkg/scheduler/BUILD | 3 +-- pkg/scheduler/core/BUILD | 4 ++-- pkg/scheduler/core/extender.go | 2 +- pkg/scheduler/core/extender_test.go | 2 +- pkg/scheduler/core/generic_scheduler.go | 2 +- pkg/scheduler/core/generic_scheduler_test.go | 2 +- pkg/scheduler/factory_test.go | 2 +- pkg/scheduler/util/BUILD | 4 ++-- pkg/scheduler/util/utils.go | 2 +- pkg/scheduler/util/utils_test.go | 2 +- staging/src/k8s.io/kube-scheduler/BUILD | 1 + .../src/k8s.io/kube-scheduler}/extender/v1/BUILD | 3 ++- .../src/k8s.io/kube-scheduler}/extender/v1/doc.go | 2 +- .../src/k8s.io/kube-scheduler}/extender/v1/types.go | 0 .../kube-scheduler}/extender/v1/zz_generated.deepcopy.go | 0 test/integration/scheduler/BUILD | 2 +- test/integration/scheduler/extender_test.go | 2 +- 17 files changed, 18 insertions(+), 17 deletions(-) rename {pkg/scheduler/apis => staging/src/k8s.io/kube-scheduler}/extender/v1/BUILD (83%) rename {pkg/scheduler/apis => staging/src/k8s.io/kube-scheduler}/extender/v1/doc.go (89%) rename {pkg/scheduler/apis => staging/src/k8s.io/kube-scheduler}/extender/v1/types.go (100%) rename {pkg/scheduler/apis => staging/src/k8s.io/kube-scheduler}/extender/v1/zz_generated.deepcopy.go (100%) diff --git a/pkg/scheduler/BUILD b/pkg/scheduler/BUILD index 5d48770e5d4..d794f0d1934 100644 --- a/pkg/scheduler/BUILD +++ b/pkg/scheduler/BUILD @@ -64,7 +64,6 @@ go_test( "//pkg/features:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/apis/config/scheme:go_default_library", - "//pkg/scheduler/apis/extender/v1:go_default_library", "//pkg/scheduler/core:go_default_library", "//pkg/scheduler/framework/plugins:go_default_library", "//pkg/scheduler/framework/plugins/defaultbinder:go_default_library", @@ -102,6 +101,7 @@ go_test( "//staging/src/k8s.io/client-go/testing:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/events:go_default_library", + "//staging/src/k8s.io/kube-scheduler/extender/v1:go_default_library", "//vendor/github.com/google/go-cmp/cmp:go_default_library", ], ) @@ -119,7 +119,6 @@ filegroup( ":package-srcs", "//pkg/scheduler/algorithmprovider:all-srcs", "//pkg/scheduler/apis/config:all-srcs", - "//pkg/scheduler/apis/extender/v1:all-srcs", "//pkg/scheduler/core:all-srcs", "//pkg/scheduler/framework:all-srcs", "//pkg/scheduler/internal/cache:all-srcs", diff --git a/pkg/scheduler/core/BUILD b/pkg/scheduler/core/BUILD index 6121b3f0e30..51e543bdc29 100644 --- a/pkg/scheduler/core/BUILD +++ b/pkg/scheduler/core/BUILD @@ -11,7 +11,6 @@ go_library( deps = [ "//pkg/api/v1/pod:go_default_library", "//pkg/scheduler/apis/config:go_default_library", - "//pkg/scheduler/apis/extender/v1:go_default_library", "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/internal/cache:go_default_library", "//pkg/scheduler/internal/queue:go_default_library", @@ -30,6 +29,7 @@ go_library( "//staging/src/k8s.io/client-go/listers/policy/v1beta1:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/util/workqueue:go_default_library", + "//staging/src/k8s.io/kube-scheduler/extender/v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/trace:go_default_library", ], @@ -45,7 +45,6 @@ go_test( deps = [ "//pkg/api/v1/pod:go_default_library", "//pkg/scheduler/apis/config:go_default_library", - "//pkg/scheduler/apis/extender/v1:go_default_library", "//pkg/scheduler/framework/plugins/defaultbinder:go_default_library", "//pkg/scheduler/framework/plugins/defaultpodtopologyspread:go_default_library", "//pkg/scheduler/framework/plugins/interpodaffinity:go_default_library", @@ -79,6 +78,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", + "//staging/src/k8s.io/kube-scheduler/extender/v1:go_default_library", ], ) diff --git a/pkg/scheduler/core/extender.go b/pkg/scheduler/core/extender.go index 11d33a7d04b..2bcbb990c2d 100644 --- a/pkg/scheduler/core/extender.go +++ b/pkg/scheduler/core/extender.go @@ -28,8 +28,8 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" restclient "k8s.io/client-go/rest" + extenderv1 "k8s.io/kube-scheduler/extender/v1" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" - extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" "k8s.io/kubernetes/pkg/scheduler/listers" schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo" ) diff --git a/pkg/scheduler/core/extender_test.go b/pkg/scheduler/core/extender_test.go index 2d3b64295d5..035102cb536 100644 --- a/pkg/scheduler/core/extender_test.go +++ b/pkg/scheduler/core/extender_test.go @@ -32,9 +32,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" clientsetfake "k8s.io/client-go/kubernetes/fake" + extenderv1 "k8s.io/kube-scheduler/extender/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" - extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go index 8a6acce0eb6..cbd76275740 100644 --- a/pkg/scheduler/core/generic_scheduler.go +++ b/pkg/scheduler/core/generic_scheduler.go @@ -36,8 +36,8 @@ import ( corelisters "k8s.io/client-go/listers/core/v1" policylisters "k8s.io/client-go/listers/policy/v1beta1" "k8s.io/client-go/util/workqueue" + extenderv1 "k8s.io/kube-scheduler/extender/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" diff --git a/pkg/scheduler/core/generic_scheduler_test.go b/pkg/scheduler/core/generic_scheduler_test.go index 5aad5b1cac6..a91766efd87 100644 --- a/pkg/scheduler/core/generic_scheduler_test.go +++ b/pkg/scheduler/core/generic_scheduler_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" clientsetfake "k8s.io/client-go/kubernetes/fake" + extenderv1 "k8s.io/kube-scheduler/extender/v1" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" - extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpodtopologyspread" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity" diff --git a/pkg/scheduler/factory_test.go b/pkg/scheduler/factory_test.go index b702e798345..1c6498a8f51 100644 --- a/pkg/scheduler/factory_test.go +++ b/pkg/scheduler/factory_test.go @@ -36,11 +36,11 @@ import ( clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/events" + extenderv1 "k8s.io/kube-scheduler/extender/v1" apitesting "k8s.io/kubernetes/pkg/api/testing" kubefeatures "k8s.io/kubernetes/pkg/features" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme" - extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" frameworkplugins "k8s.io/kubernetes/pkg/scheduler/framework/plugins" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity" diff --git a/pkg/scheduler/util/BUILD b/pkg/scheduler/util/BUILD index 7270ca8f316..857710883e1 100644 --- a/pkg/scheduler/util/BUILD +++ b/pkg/scheduler/util/BUILD @@ -16,13 +16,13 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/scheduler/apis/extender/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/selection:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", + "//staging/src/k8s.io/kube-scheduler/extender/v1:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", ], ) @@ -40,11 +40,11 @@ go_library( deps = [ "//pkg/api/v1/pod:go_default_library", "//pkg/apis/core/v1/helper:go_default_library", - "//pkg/scheduler/apis/extender/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", + "//staging/src/k8s.io/kube-scheduler/extender/v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/pkg/scheduler/util/utils.go b/pkg/scheduler/util/utils.go index f46b0c0746a..77cd9a0da22 100644 --- a/pkg/scheduler/util/utils.go +++ b/pkg/scheduler/util/utils.go @@ -22,8 +22,8 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + extenderv1 "k8s.io/kube-scheduler/extender/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" ) // GetPodFullName returns a name that uniquely identifies a pod. diff --git a/pkg/scheduler/util/utils_test.go b/pkg/scheduler/util/utils_test.go index 4c8361d0ada..4c1467da558 100644 --- a/pkg/scheduler/util/utils_test.go +++ b/pkg/scheduler/util/utils_test.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" + extenderv1 "k8s.io/kube-scheduler/extender/v1" ) func TestGetPodFullName(t *testing.T) { diff --git a/staging/src/k8s.io/kube-scheduler/BUILD b/staging/src/k8s.io/kube-scheduler/BUILD index 916422f7f77..60f5cf5da45 100644 --- a/staging/src/k8s.io/kube-scheduler/BUILD +++ b/staging/src/k8s.io/kube-scheduler/BUILD @@ -12,6 +12,7 @@ filegroup( "//staging/src/k8s.io/kube-scheduler/config/v1:all-srcs", "//staging/src/k8s.io/kube-scheduler/config/v1alpha1:all-srcs", "//staging/src/k8s.io/kube-scheduler/config/v1alpha2:all-srcs", + "//staging/src/k8s.io/kube-scheduler/extender/v1:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/pkg/scheduler/apis/extender/v1/BUILD b/staging/src/k8s.io/kube-scheduler/extender/v1/BUILD similarity index 83% rename from pkg/scheduler/apis/extender/v1/BUILD rename to staging/src/k8s.io/kube-scheduler/extender/v1/BUILD index a4d7ca21ba5..df3ab5a0d51 100644 --- a/pkg/scheduler/apis/extender/v1/BUILD +++ b/staging/src/k8s.io/kube-scheduler/extender/v1/BUILD @@ -7,7 +7,8 @@ go_library( "types.go", "zz_generated.deepcopy.go", ], - importpath = "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kube-scheduler/extender/v1", + importpath = "k8s.io/kube-scheduler/extender/v1", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/scheduler/apis/extender/v1/doc.go b/staging/src/k8s.io/kube-scheduler/extender/v1/doc.go similarity index 89% rename from pkg/scheduler/apis/extender/v1/doc.go rename to staging/src/k8s.io/kube-scheduler/extender/v1/doc.go index 856d4c628d2..202572083ac 100644 --- a/pkg/scheduler/apis/extender/v1/doc.go +++ b/staging/src/k8s.io/kube-scheduler/extender/v1/doc.go @@ -17,4 +17,4 @@ limitations under the License. // +k8s:deepcopy-gen=package // Package v1 contains scheduler API objects. -package v1 // import "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" +package v1 // import "k8s.io/kube-scheduler/extender/v1" diff --git a/pkg/scheduler/apis/extender/v1/types.go b/staging/src/k8s.io/kube-scheduler/extender/v1/types.go similarity index 100% rename from pkg/scheduler/apis/extender/v1/types.go rename to staging/src/k8s.io/kube-scheduler/extender/v1/types.go diff --git a/pkg/scheduler/apis/extender/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/kube-scheduler/extender/v1/zz_generated.deepcopy.go similarity index 100% rename from pkg/scheduler/apis/extender/v1/zz_generated.deepcopy.go rename to staging/src/k8s.io/kube-scheduler/extender/v1/zz_generated.deepcopy.go diff --git a/test/integration/scheduler/BUILD b/test/integration/scheduler/BUILD index 35a508bc5fb..5baae871611 100644 --- a/test/integration/scheduler/BUILD +++ b/test/integration/scheduler/BUILD @@ -29,7 +29,6 @@ go_test( "//pkg/features:go_default_library", "//pkg/scheduler:go_default_library", "//pkg/scheduler/apis/config:go_default_library", - "//pkg/scheduler/apis/extender/v1:go_default_library", "//pkg/scheduler/framework/plugins/defaultbinder:go_default_library", "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", @@ -59,6 +58,7 @@ go_test( "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/events:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", + "//staging/src/k8s.io/kube-scheduler/extender/v1:go_default_library", "//test/e2e/framework/pod:go_default_library", "//test/integration/framework:go_default_library", "//test/utils:go_default_library", diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go index e09382039d9..9765f348286 100644 --- a/test/integration/scheduler/extender_test.go +++ b/test/integration/scheduler/extender_test.go @@ -33,8 +33,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" + extenderv1 "k8s.io/kube-scheduler/extender/v1" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" - extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" imageutils "k8s.io/kubernetes/test/utils/image" )