diff --git a/cmd/kube-scheduler/app/BUILD b/cmd/kube-scheduler/app/BUILD index 9da5fa05a79..f7bcbdef8f7 100644 --- a/cmd/kube-scheduler/app/BUILD +++ b/cmd/kube-scheduler/app/BUILD @@ -16,6 +16,7 @@ go_library( "//pkg/scheduler:go_default_library", "//pkg/scheduler/algorithmprovider:go_default_library", "//pkg/scheduler/apis/config:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/metrics:go_default_library", "//pkg/util/configz:go_default_library", "//pkg/util/flag:go_default_library", diff --git a/pkg/scheduler/BUILD b/pkg/scheduler/BUILD index ff27174c460..3fe23339be8 100644 --- a/pkg/scheduler/BUILD +++ b/pkg/scheduler/BUILD @@ -17,10 +17,10 @@ go_library( "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/core:go_default_library", "//pkg/scheduler/factory:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/internal/cache:go_default_library", "//pkg/scheduler/internal/queue:go_default_library", "//pkg/scheduler/metrics:go_default_library", - "//pkg/scheduler/plugins/v1alpha1:go_default_library", "//pkg/scheduler/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/storage/v1:go_default_library", @@ -58,6 +58,7 @@ go_test( "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/core:go_default_library", "//pkg/scheduler/factory:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/internal/cache:go_default_library", "//pkg/scheduler/internal/cache/fake:go_default_library", "//pkg/scheduler/internal/queue:go_default_library", @@ -97,11 +98,11 @@ filegroup( "//pkg/scheduler/apis/config:all-srcs", "//pkg/scheduler/core:all-srcs", "//pkg/scheduler/factory:all-srcs", + "//pkg/scheduler/framework:all-srcs", "//pkg/scheduler/internal/cache:all-srcs", "//pkg/scheduler/internal/queue:all-srcs", "//pkg/scheduler/metrics:all-srcs", "//pkg/scheduler/nodeinfo:all-srcs", - "//pkg/scheduler/plugins:all-srcs", "//pkg/scheduler/testing:all-srcs", "//pkg/scheduler/util:all-srcs", "//pkg/scheduler/volumebinder:all-srcs", diff --git a/pkg/scheduler/core/BUILD b/pkg/scheduler/core/BUILD index 64b582126bb..e6e7126dbba 100644 --- a/pkg/scheduler/core/BUILD +++ b/pkg/scheduler/core/BUILD @@ -13,11 +13,11 @@ go_library( "//pkg/scheduler/algorithm/predicates:go_default_library", "//pkg/scheduler/algorithm/priorities:go_default_library", "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/internal/cache:go_default_library", "//pkg/scheduler/internal/queue:go_default_library", "//pkg/scheduler/metrics:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", - "//pkg/scheduler/plugins/v1alpha1:go_default_library", "//pkg/scheduler/util:go_default_library", "//pkg/scheduler/volumebinder:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -48,10 +48,10 @@ go_test( "//pkg/scheduler/algorithm/priorities:go_default_library", "//pkg/scheduler/algorithm/priorities/util:go_default_library", "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/internal/cache:go_default_library", "//pkg/scheduler/internal/queue:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", - "//pkg/scheduler/plugins/v1alpha1:go_default_library", "//pkg/scheduler/testing:go_default_library", "//pkg/scheduler/util:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/pkg/scheduler/factory/BUILD b/pkg/scheduler/factory/BUILD index 905dba73bc8..453444191c0 100644 --- a/pkg/scheduler/factory/BUILD +++ b/pkg/scheduler/factory/BUILD @@ -16,11 +16,10 @@ go_library( "//pkg/scheduler/api:go_default_library", "//pkg/scheduler/api/validation:go_default_library", "//pkg/scheduler/core:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/internal/cache:go_default_library", "//pkg/scheduler/internal/cache/debugger:go_default_library", "//pkg/scheduler/internal/queue:go_default_library", - "//pkg/scheduler/plugins:go_default_library", - "//pkg/scheduler/plugins/v1alpha1:go_default_library", "//pkg/scheduler/volumebinder:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -61,6 +60,7 @@ go_test( "//pkg/scheduler/algorithm/priorities:go_default_library", "//pkg/scheduler/api:go_default_library", "//pkg/scheduler/api/latest:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/internal/cache:go_default_library", "//pkg/scheduler/internal/queue:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", diff --git a/pkg/scheduler/framework/BUILD b/pkg/scheduler/framework/BUILD index 8de218f021c..40805ad2570 100644 --- a/pkg/scheduler/framework/BUILD +++ b/pkg/scheduler/framework/BUILD @@ -1,16 +1,3 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["registrar.go"], - importpath = "k8s.io/kubernetes/pkg/scheduler/plugins", - visibility = ["//visibility:public"], - deps = [ - "//pkg/scheduler/internal/cache:go_default_library", - "//pkg/scheduler/plugins/v1alpha1:go_default_library", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), @@ -22,8 +9,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/scheduler/plugins/examples:all-srcs", - "//pkg/scheduler/plugins/v1alpha1:all-srcs", + "//pkg/scheduler/framework/plugins/examples:all-srcs", + "//pkg/scheduler/framework/v1alpha1:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/pkg/scheduler/framework/plugins/examples/BUILD b/pkg/scheduler/framework/plugins/examples/BUILD index bc26941c8eb..a38cd018329 100644 --- a/pkg/scheduler/framework/plugins/examples/BUILD +++ b/pkg/scheduler/framework/plugins/examples/BUILD @@ -1,21 +1,3 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "multipoint.go", - "prebind.go", - "stateful.go", - ], - importpath = "k8s.io/kubernetes/pkg/scheduler/plugins/examples", - visibility = ["//visibility:public"], - deps = [ - "//pkg/scheduler/plugins/v1alpha1:go_default_library", - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), @@ -25,7 +7,12 @@ filegroup( filegroup( name = "all-srcs", - srcs = [":package-srcs"], + srcs = [ + ":package-srcs", + "//pkg/scheduler/framework/plugins/examples/multipoint:all-srcs", + "//pkg/scheduler/framework/plugins/examples/prebind:all-srcs", + "//pkg/scheduler/framework/plugins/examples/stateful:all-srcs", + ], tags = ["automanaged"], visibility = ["//visibility:public"], ) diff --git a/pkg/scheduler/framework/plugins/examples/multipoint/BUILD b/pkg/scheduler/framework/plugins/examples/multipoint/BUILD new file mode 100644 index 00000000000..5e016182c7c --- /dev/null +++ b/pkg/scheduler/framework/plugins/examples/multipoint/BUILD @@ -0,0 +1,27 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["multipoint.go"], + importpath = "k8s.io/kubernetes/pkg/scheduler/framework/plugins/examples/multipoint", + visibility = ["//visibility:public"], + deps = [ + "//pkg/scheduler/framework/v1alpha1:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/scheduler/framework/plugins/examples/prebind/BUILD b/pkg/scheduler/framework/plugins/examples/prebind/BUILD new file mode 100644 index 00000000000..3a805cd1950 --- /dev/null +++ b/pkg/scheduler/framework/plugins/examples/prebind/BUILD @@ -0,0 +1,27 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["prebind.go"], + importpath = "k8s.io/kubernetes/pkg/scheduler/framework/plugins/examples/prebind", + visibility = ["//visibility:public"], + deps = [ + "//pkg/scheduler/framework/v1alpha1:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/scheduler/framework/plugins/examples/stateful/BUILD b/pkg/scheduler/framework/plugins/examples/stateful/BUILD new file mode 100644 index 00000000000..3753e596f5b --- /dev/null +++ b/pkg/scheduler/framework/plugins/examples/stateful/BUILD @@ -0,0 +1,28 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["stateful.go"], + importpath = "k8s.io/kubernetes/pkg/scheduler/framework/plugins/examples/stateful", + visibility = ["//visibility:public"], + deps = [ + "//pkg/scheduler/framework/v1alpha1:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/klog:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/scheduler/framework/v1alpha1/BUILD b/pkg/scheduler/framework/v1alpha1/BUILD index 619bd4685a9..a258da876f9 100644 --- a/pkg/scheduler/framework/v1alpha1/BUILD +++ b/pkg/scheduler/framework/v1alpha1/BUILD @@ -4,13 +4,17 @@ go_library( name = "go_default_library", srcs = [ "context.go", + "framework.go", "interface.go", + "registry.go", ], - importpath = "k8s.io/kubernetes/pkg/scheduler/plugins/v1alpha1", + importpath = "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1", visibility = ["//visibility:public"], deps = [ "//pkg/scheduler/internal/cache:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/test/integration/scheduler/BUILD b/test/integration/scheduler/BUILD index fd1ced4b9d1..871e9f47fea 100644 --- a/test/integration/scheduler/BUILD +++ b/test/integration/scheduler/BUILD @@ -11,8 +11,8 @@ go_test( size = "large", srcs = [ "extender_test.go", + "framework_test.go", "main_test.go", - "plugin_test.go", "predicates_test.go", "preemption_test.go", "priorities_test.go", @@ -35,8 +35,8 @@ go_test( "//pkg/scheduler/api:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/factory:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", - "//pkg/scheduler/plugins/v1alpha1:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/testing:go_default_library", "//plugin/pkg/admission/podtolerationrestriction:go_default_library", @@ -47,6 +47,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/api/errors: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/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", @@ -95,7 +96,7 @@ go_library( "//pkg/scheduler/algorithmprovider:go_default_library", "//pkg/scheduler/api:go_default_library", "//pkg/scheduler/factory:go_default_library", - "//pkg/scheduler/plugins/v1alpha1:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/util/taints:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/policy/v1beta1:go_default_library",