diff --git a/build/BUILD b/build/BUILD index 5f531a1f66..7e7beb7d67 100644 --- a/build/BUILD +++ b/build/BUILD @@ -38,7 +38,7 @@ DOCKERIZED_BINARIES = { }, "kube-scheduler": { "base": "@official_busybox//image", - "target": "//plugin/cmd/kube-scheduler:kube-scheduler", + "target": "//cmd/kube-scheduler:kube-scheduler", }, "kube-proxy": { "base": "@debian-iptables-amd64//image", @@ -127,7 +127,7 @@ release_filegroup( "//cmd/hyperkube", "//cmd/kube-apiserver", "//cmd/kube-controller-manager", - "//plugin/cmd/kube-scheduler", + "//cmd/kube-scheduler", "//vendor/k8s.io/kube-aggregator", ], ) diff --git a/build/debs/BUILD b/build/debs/BUILD index 1ff31b739e..d8a195dbc7 100644 --- a/build/debs/BUILD +++ b/build/debs/BUILD @@ -41,7 +41,7 @@ deb_data( name = "kube-scheduler", data = [ { - "files": ["//plugin/cmd/kube-scheduler"], + "files": ["//cmd/kube-scheduler"], "mode": "0755", "dir": "/usr/bin", }, diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD index b9f62f1f23..08ca5450af 100644 --- a/build/visible_to/BUILD +++ b/build/visible_to/BUILD @@ -210,7 +210,7 @@ package_group( "//cmd/clicheck", "//cmd/hyperkube", "//cmd/kube-proxy/app", - "//plugin/cmd/kube-scheduler/app", + "//cmd/kube-scheduler/app", ], ) diff --git a/cmd/BUILD b/cmd/BUILD index e8ed83675a..1d4c2545ec 100644 --- a/cmd/BUILD +++ b/cmd/BUILD @@ -26,6 +26,7 @@ filegroup( "//cmd/kube-apiserver:all-srcs", "//cmd/kube-controller-manager:all-srcs", "//cmd/kube-proxy:all-srcs", + "//cmd/kube-scheduler:all-srcs", "//cmd/kubeadm:all-srcs", "//cmd/kubectl:all-srcs", "//cmd/kubelet:all-srcs", diff --git a/cmd/genkubedocs/BUILD b/cmd/genkubedocs/BUILD index ef6c78a34e..4041333ae0 100644 --- a/cmd/genkubedocs/BUILD +++ b/cmd/genkubedocs/BUILD @@ -26,9 +26,9 @@ go_library( "//cmd/kube-apiserver/app:go_default_library", "//cmd/kube-controller-manager/app:go_default_library", "//cmd/kube-proxy/app:go_default_library", + "//cmd/kube-scheduler/app:go_default_library", "//cmd/kubeadm/app/cmd:go_default_library", "//cmd/kubelet/app:go_default_library", - "//plugin/cmd/kube-scheduler/app:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/cobra/doc:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", diff --git a/cmd/genman/BUILD b/cmd/genman/BUILD index e2e4f9df62..c3fcedb807 100644 --- a/cmd/genman/BUILD +++ b/cmd/genman/BUILD @@ -22,11 +22,11 @@ go_library( "//cmd/kube-apiserver/app:go_default_library", "//cmd/kube-controller-manager/app:go_default_library", "//cmd/kube-proxy/app:go_default_library", + "//cmd/kube-scheduler/app:go_default_library", "//cmd/kubeadm/app/cmd:go_default_library", "//cmd/kubelet/app:go_default_library", "//pkg/kubectl/cmd:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//plugin/cmd/kube-scheduler/app:go_default_library", "//vendor/github.com/cpuguy83/go-md2man/md2man:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", diff --git a/cmd/hyperkube/BUILD b/cmd/hyperkube/BUILD index e806fae743..09ce16626f 100644 --- a/cmd/hyperkube/BUILD +++ b/cmd/hyperkube/BUILD @@ -51,6 +51,7 @@ go_library( "//cmd/kube-controller-manager/app:go_default_library", "//cmd/kube-controller-manager/app/options:go_default_library", "//cmd/kube-proxy/app:go_default_library", + "//cmd/kube-scheduler/app:go_default_library", "//cmd/kubelet/app:go_default_library", "//cmd/kubelet/app/options:go_default_library", "//pkg/client/metrics/prometheus:go_default_library", @@ -59,7 +60,6 @@ go_library( "//pkg/util/template:go_default_library", "//pkg/version/prometheus:go_default_library", "//pkg/version/verflag:go_default_library", - "//plugin/cmd/kube-scheduler/app:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apiserver/pkg/server:go_default_library", diff --git a/cmd/kube-scheduler/BUILD b/cmd/kube-scheduler/BUILD index 905919efa4..88e75f4e81 100644 --- a/cmd/kube-scheduler/BUILD +++ b/cmd/kube-scheduler/BUILD @@ -10,7 +10,7 @@ load("//pkg/version:def.bzl", "version_x_defs") go_binary( name = "kube-scheduler", embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/cmd/kube-scheduler", + importpath = "k8s.io/kubernetes/cmd/kube-scheduler", pure = "on", x_defs = version_x_defs(), ) @@ -18,11 +18,11 @@ go_binary( go_library( name = "go_default_library", srcs = ["scheduler.go"], - importpath = "k8s.io/kubernetes/plugin/cmd/kube-scheduler", + importpath = "k8s.io/kubernetes/cmd/kube-scheduler", deps = [ + "//cmd/kube-scheduler/app:go_default_library", "//pkg/client/metrics/prometheus:go_default_library", "//pkg/version/prometheus:go_default_library", - "//plugin/cmd/kube-scheduler/app:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/logs:go_default_library", ], @@ -39,7 +39,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//plugin/cmd/kube-scheduler/app:all-srcs", + "//cmd/kube-scheduler/app:all-srcs", ], tags = ["automanaged"], ) diff --git a/cmd/kube-scheduler/app/BUILD b/cmd/kube-scheduler/app/BUILD index 9de3152c18..990d72a0bc 100644 --- a/cmd/kube-scheduler/app/BUILD +++ b/cmd/kube-scheduler/app/BUILD @@ -8,7 +8,7 @@ load( go_library( name = "go_default_library", srcs = ["server.go"], - importpath = "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app", + importpath = "k8s.io/kubernetes/cmd/kube-scheduler/app", deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/componentconfig:go_default_library", @@ -18,14 +18,14 @@ go_library( "//pkg/features:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/master/ports:go_default_library", + "//pkg/scheduler:go_default_library", + "//pkg/scheduler/algorithmprovider:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/api/latest:go_default_library", + "//pkg/scheduler/factory:go_default_library", "//pkg/util/configz:go_default_library", "//pkg/version:go_default_library", "//pkg/version/verflag:go_default_library", - "//plugin/pkg/scheduler:go_default_library", - "//plugin/pkg/scheduler/algorithmprovider:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/api/latest:go_default_library", - "//plugin/pkg/scheduler/factory:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/cmd/kubeadm/app/phases/addons/proxy/BUILD b/cmd/kubeadm/app/phases/addons/proxy/BUILD index 170b09364f..c08b0dd6a4 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/BUILD +++ b/cmd/kubeadm/app/phases/addons/proxy/BUILD @@ -41,7 +41,7 @@ go_library( "//pkg/api/legacyscheme:go_default_library", "//pkg/proxy/apis/kubeproxyconfig/scheme:go_default_library", "//pkg/proxy/apis/kubeproxyconfig/v1alpha1:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//vendor/k8s.io/api/apps/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/rbac/v1:go_default_library", diff --git a/cmd/kubeadm/app/preflight/BUILD b/cmd/kubeadm/app/preflight/BUILD index ec8e552e1e..23f8484317 100644 --- a/cmd/kubeadm/app/preflight/BUILD +++ b/cmd/kubeadm/app/preflight/BUILD @@ -51,6 +51,7 @@ go_library( deps = [ "//cmd/kube-apiserver/app/options:go_default_library", "//cmd/kube-controller-manager/app/options:go_default_library", + "//cmd/kube-scheduler/app:go_default_library", "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", "//pkg/apis/core/validation:go_default_library", @@ -59,7 +60,6 @@ go_library( "//pkg/util/initsystem:go_default_library", "//pkg/util/version:go_default_library", "//pkg/version:go_default_library", - "//plugin/cmd/kube-scheduler/app:go_default_library", "//test/e2e_node/system:go_default_library", "//vendor/github.com/PuerkitoBio/purell:go_default_library", "//vendor/github.com/blang/semver:go_default_library", diff --git a/examples/BUILD b/examples/BUILD index b2175aebcd..8fa87a454e 100644 --- a/examples/BUILD +++ b/examples/BUILD @@ -39,8 +39,8 @@ go_test( "//pkg/apis/extensions/validation:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/registry/batch/job:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/api/latest:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/api/latest:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/pkg/BUILD b/pkg/BUILD index 66f3fc06e3..5e06162d6c 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -95,6 +95,7 @@ filegroup( "//pkg/quota:all-srcs", "//pkg/registry:all-srcs", "//pkg/routes:all-srcs", + "//pkg/scheduler:all-srcs", "//pkg/security:all-srcs", "//pkg/securitycontext:all-srcs", "//pkg/serviceaccount:all-srcs", diff --git a/pkg/controller/cloud/BUILD b/pkg/controller/cloud/BUILD index a482039381..dfd2739720 100644 --- a/pkg/controller/cloud/BUILD +++ b/pkg/controller/cloud/BUILD @@ -18,8 +18,8 @@ go_library( "//pkg/cloudprovider:go_default_library", "//pkg/controller:go_default_library", "//pkg/kubelet/apis:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//pkg/util/node:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -56,7 +56,7 @@ go_test( "//pkg/controller:go_default_library", "//pkg/controller/testutil:go_default_library", "//pkg/kubelet/apis:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/controller/daemon/BUILD b/pkg/controller/daemon/BUILD index 47a123cd92..761262f410 100644 --- a/pkg/controller/daemon/BUILD +++ b/pkg/controller/daemon/BUILD @@ -21,11 +21,11 @@ go_library( "//pkg/controller/daemon/util:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/types:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//pkg/util/labels:go_default_library", "//pkg/util/metrics:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", @@ -74,9 +74,9 @@ go_test( "//pkg/apis/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/kubelet/types:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//pkg/securitycontext:go_default_library", "//pkg/util/labels:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/pkg/controller/daemon/util/BUILD b/pkg/controller/daemon/util/BUILD index d3e5dde3dc..bb9f1f11cf 100644 --- a/pkg/controller/daemon/util/BUILD +++ b/pkg/controller/daemon/util/BUILD @@ -15,8 +15,8 @@ go_library( "//pkg/apis/core/v1/helper:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/types:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//pkg/util/labels:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/controller/nodelifecycle/BUILD b/pkg/controller/nodelifecycle/BUILD index 25d036e3cf..55f577fe54 100644 --- a/pkg/controller/nodelifecycle/BUILD +++ b/pkg/controller/nodelifecycle/BUILD @@ -14,12 +14,12 @@ go_library( "//pkg/controller:go_default_library", "//pkg/controller/nodelifecycle/scheduler:go_default_library", "//pkg/controller/util/node:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//pkg/util/metrics:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/system:go_default_library", "//pkg/util/taints:go_default_library", "//pkg/util/version:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", @@ -72,9 +72,9 @@ go_test( "//pkg/controller/testutil:go_default_library", "//pkg/controller/util/node:go_default_library", "//pkg/kubelet/apis:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/taints:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 5ab4a2d6b6..1a55be0ba0 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -87,6 +87,8 @@ go_library( "//pkg/kubelet/util/queue:go_default_library", "//pkg/kubelet/util/sliceutils:go_default_library", "//pkg/kubelet/volumemanager:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", "//pkg/security/apparmor:go_default_library", "//pkg/securitycontext:go_default_library", "//pkg/util/dbus:go_default_library", @@ -103,8 +105,6 @@ go_library( "//pkg/volume/util/types:go_default_library", "//pkg/volume/util/volumehelper:go_default_library", "//pkg/volume/validation:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", "//third_party/forked/golang/expansion:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/golang/groupcache/lru:go_default_library", @@ -199,13 +199,13 @@ go_test( "//pkg/kubelet/util/queue:go_default_library", "//pkg/kubelet/util/sliceutils:go_default_library", "//pkg/kubelet/volumemanager:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/version:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/host_path:go_default_library", "//pkg/volume/testing:go_default_library", "//pkg/volume/util/volumehelper:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/pkg/kubelet/cm/BUILD b/pkg/kubelet/cm/BUILD index a331a8be77..32a8175063 100644 --- a/pkg/kubelet/cm/BUILD +++ b/pkg/kubelet/cm/BUILD @@ -91,7 +91,7 @@ go_library( "//pkg/kubelet/eviction/api:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", "//pkg/kubelet/status:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", diff --git a/pkg/kubelet/cm/deviceplugin/BUILD b/pkg/kubelet/cm/deviceplugin/BUILD index eb780952c4..11df63bea1 100644 --- a/pkg/kubelet/cm/deviceplugin/BUILD +++ b/pkg/kubelet/cm/deviceplugin/BUILD @@ -25,8 +25,8 @@ go_library( "//pkg/kubelet/lifecycle:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//pkg/kubelet/util/store:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//pkg/util/filesystem:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/golang.org/x/net/context:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", @@ -61,8 +61,8 @@ go_test( "//pkg/kubelet/apis/deviceplugin/v1alpha:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", "//pkg/kubelet/util/store:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//pkg/util/filesystem:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/kubelet/eviction/BUILD b/pkg/kubelet/eviction/BUILD index dba5bf9540..33c570f3b4 100644 --- a/pkg/kubelet/eviction/BUILD +++ b/pkg/kubelet/eviction/BUILD @@ -89,7 +89,7 @@ go_library( "//pkg/kubelet/server/stats:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/kubelet/util/format:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", + "//pkg/scheduler/util:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/pkg/kubelet/lifecycle/BUILD b/pkg/kubelet/lifecycle/BUILD index f3f4255321..a1a64a03e1 100644 --- a/pkg/kubelet/lifecycle/BUILD +++ b/pkg/kubelet/lifecycle/BUILD @@ -21,10 +21,10 @@ go_library( "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/kubelet/util/format:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//pkg/security/apparmor:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", diff --git a/pkg/kubelet/preemption/BUILD b/pkg/kubelet/preemption/BUILD index 7c0b90843c..58899d1cd0 100644 --- a/pkg/kubelet/preemption/BUILD +++ b/pkg/kubelet/preemption/BUILD @@ -19,8 +19,8 @@ go_library( "//pkg/kubelet/lifecycle:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/kubelet/util/format:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library", diff --git a/pkg/scheduler/BUILD b/pkg/scheduler/BUILD index 9e8ae5b590..d1d7be4043 100644 --- a/pkg/scheduler/BUILD +++ b/pkg/scheduler/BUILD @@ -10,17 +10,17 @@ go_test( name = "go_default_test", srcs = ["scheduler_test.go"], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler", + importpath = "k8s.io/kubernetes/pkg/scheduler", deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/controller/volume/persistentvolume:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/core:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//plugin/pkg/scheduler/testing:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", - "//plugin/pkg/scheduler/volumebinder:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/core:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/testing:go_default_library", + "//pkg/scheduler/util:go_default_library", + "//pkg/scheduler/volumebinder:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -39,17 +39,17 @@ go_library( "scheduler.go", "testutil.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler", + importpath = "k8s.io/kubernetes/pkg/scheduler", deps = [ "//pkg/features:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/core:go_default_library", - "//plugin/pkg/scheduler/metrics:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", - "//plugin/pkg/scheduler/volumebinder:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/core:go_default_library", + "//pkg/scheduler/metrics:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/util:go_default_library", + "//pkg/scheduler/volumebinder:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -73,16 +73,16 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//plugin/pkg/scheduler/algorithm:all-srcs", - "//plugin/pkg/scheduler/algorithmprovider:all-srcs", - "//plugin/pkg/scheduler/api:all-srcs", - "//plugin/pkg/scheduler/core:all-srcs", - "//plugin/pkg/scheduler/factory:all-srcs", - "//plugin/pkg/scheduler/metrics:all-srcs", - "//plugin/pkg/scheduler/schedulercache:all-srcs", - "//plugin/pkg/scheduler/testing:all-srcs", - "//plugin/pkg/scheduler/util:all-srcs", - "//plugin/pkg/scheduler/volumebinder:all-srcs", + "//pkg/scheduler/algorithm:all-srcs", + "//pkg/scheduler/algorithmprovider:all-srcs", + "//pkg/scheduler/api:all-srcs", + "//pkg/scheduler/core:all-srcs", + "//pkg/scheduler/factory:all-srcs", + "//pkg/scheduler/metrics:all-srcs", + "//pkg/scheduler/schedulercache:all-srcs", + "//pkg/scheduler/testing:all-srcs", + "//pkg/scheduler/util:all-srcs", + "//pkg/scheduler/volumebinder:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/scheduler/algorithm/BUILD b/pkg/scheduler/algorithm/BUILD index 644d0e1c04..30df762dd4 100644 --- a/pkg/scheduler/algorithm/BUILD +++ b/pkg/scheduler/algorithm/BUILD @@ -14,10 +14,10 @@ go_library( "types.go", "well_known_labels.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm", deps = [ - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", @@ -32,9 +32,9 @@ go_test( "types_test.go", ], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm", deps = [ - "//plugin/pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", ], @@ -51,8 +51,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//plugin/pkg/scheduler/algorithm/predicates:all-srcs", - "//plugin/pkg/scheduler/algorithm/priorities:all-srcs", + "//pkg/scheduler/algorithm/predicates:all-srcs", + "//pkg/scheduler/algorithm/priorities:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/scheduler/algorithm/predicates/BUILD b/pkg/scheduler/algorithm/predicates/BUILD index ed72a2878a..6c091d1381 100644 --- a/pkg/scheduler/algorithm/predicates/BUILD +++ b/pkg/scheduler/algorithm/predicates/BUILD @@ -15,18 +15,18 @@ go_library( "testing_helper.go", "utils.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates", deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/apis/core/v1/helper/qos:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/apis:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/priorities/util:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/util:go_default_library", + "//pkg/scheduler/volumebinder:go_default_library", "//pkg/volume/util:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", - "//plugin/pkg/scheduler/volumebinder:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/storage/v1:go_default_library", @@ -50,14 +50,14 @@ go_test( "utils_test.go", ], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates", deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/kubelet/apis:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//plugin/pkg/scheduler/testing:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/testing:go_default_library", + "//pkg/scheduler/util:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/storage/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/pkg/scheduler/algorithm/priorities/BUILD b/pkg/scheduler/algorithm/priorities/BUILD index 027d0112e2..19bb57476f 100644 --- a/pkg/scheduler/algorithm/priorities/BUILD +++ b/pkg/scheduler/algorithm/priorities/BUILD @@ -25,15 +25,15 @@ go_library( "taint_toleration.go", "test_util.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities", deps = [ "//pkg/apis/core/v1/helper:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/algorithm/priorities/util:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//pkg/util/node:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -61,13 +61,13 @@ go_test( "taint_toleration_test.go", ], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities", deps = [ "//pkg/kubelet/apis:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//plugin/pkg/scheduler/testing:go_default_library", + "//pkg/scheduler/algorithm/priorities/util:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/testing:go_default_library", "//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", @@ -87,7 +87,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//plugin/pkg/scheduler/algorithm/priorities/util:all-srcs", + "//pkg/scheduler/algorithm/priorities/util:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/scheduler/algorithm/priorities/util/BUILD b/pkg/scheduler/algorithm/priorities/util/BUILD index d997e4d68b..d58c0e65b2 100644 --- a/pkg/scheduler/algorithm/priorities/util/BUILD +++ b/pkg/scheduler/algorithm/priorities/util/BUILD @@ -14,7 +14,7 @@ go_test( "util_test.go", ], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util", deps = [ "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", @@ -33,7 +33,7 @@ go_library( "topologies.go", "util.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util", deps = [ "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/scheduler/algorithmprovider/BUILD b/pkg/scheduler/algorithmprovider/BUILD index e9fe7f977f..4e721f3c83 100644 --- a/pkg/scheduler/algorithmprovider/BUILD +++ b/pkg/scheduler/algorithmprovider/BUILD @@ -9,17 +9,17 @@ load( go_library( name = "go_default_library", srcs = ["plugins.go"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider", - deps = ["//plugin/pkg/scheduler/algorithmprovider/defaults:go_default_library"], + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithmprovider", + deps = ["//pkg/scheduler/algorithmprovider/defaults:go_default_library"], ) go_test( name = "go_default_test", srcs = ["plugins_test.go"], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithmprovider", deps = [ - "//plugin/pkg/scheduler/factory:go_default_library", + "//pkg/scheduler/factory:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library", ], ) @@ -35,7 +35,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//plugin/pkg/scheduler/algorithmprovider/defaults:all-srcs", + "//pkg/scheduler/algorithmprovider/defaults:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/scheduler/algorithmprovider/defaults/BUILD b/pkg/scheduler/algorithmprovider/defaults/BUILD index 15cbd49b81..f58bc3b970 100644 --- a/pkg/scheduler/algorithmprovider/defaults/BUILD +++ b/pkg/scheduler/algorithmprovider/defaults/BUILD @@ -9,14 +9,14 @@ load( go_library( name = "go_default_library", srcs = ["defaults.go"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults", deps = [ "//pkg/features:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities:go_default_library", - "//plugin/pkg/scheduler/core:go_default_library", - "//plugin/pkg/scheduler/factory:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/algorithm/priorities:go_default_library", + "//pkg/scheduler/core:go_default_library", + "//pkg/scheduler/factory:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library", @@ -30,14 +30,14 @@ go_test( "defaults_test.go", ], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults", + importpath = "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults", deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core/install:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/api/latest:go_default_library", - "//plugin/pkg/scheduler/factory:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/api/latest:go_default_library", + "//pkg/scheduler/factory:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", diff --git a/pkg/scheduler/api/BUILD b/pkg/scheduler/api/BUILD index 593cff9295..eeaef16a42 100644 --- a/pkg/scheduler/api/BUILD +++ b/pkg/scheduler/api/BUILD @@ -13,7 +13,7 @@ go_library( "types.go", "zz_generated.deepcopy.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/api", + importpath = "k8s.io/kubernetes/pkg/scheduler/api", deps = [ "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -35,9 +35,9 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//plugin/pkg/scheduler/api/latest:all-srcs", - "//plugin/pkg/scheduler/api/v1:all-srcs", - "//plugin/pkg/scheduler/api/validation:all-srcs", + "//pkg/scheduler/api/latest:all-srcs", + "//pkg/scheduler/api/v1:all-srcs", + "//pkg/scheduler/api/validation:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/scheduler/api/latest/BUILD b/pkg/scheduler/api/latest/BUILD index ee0f0ffa1c..439f952b52 100644 --- a/pkg/scheduler/api/latest/BUILD +++ b/pkg/scheduler/api/latest/BUILD @@ -8,10 +8,10 @@ load( go_library( name = "go_default_library", srcs = ["latest.go"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest", + importpath = "k8s.io/kubernetes/pkg/scheduler/api/latest", deps = [ - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/api/v1:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/api/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer/json:go_default_library", diff --git a/pkg/scheduler/api/v1/BUILD b/pkg/scheduler/api/v1/BUILD index 2516dc06b1..35e291a27d 100644 --- a/pkg/scheduler/api/v1/BUILD +++ b/pkg/scheduler/api/v1/BUILD @@ -13,9 +13,9 @@ go_library( "types.go", "zz_generated.deepcopy.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/api/v1", + importpath = "k8s.io/kubernetes/pkg/scheduler/api/v1", deps = [ - "//plugin/pkg/scheduler/api:go_default_library", + "//pkg/scheduler/api:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/pkg/scheduler/api/validation/BUILD b/pkg/scheduler/api/validation/BUILD index 3ec8db39c7..eaffc9a1a8 100644 --- a/pkg/scheduler/api/validation/BUILD +++ b/pkg/scheduler/api/validation/BUILD @@ -9,9 +9,9 @@ load( go_library( name = "go_default_library", srcs = ["validation.go"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/api/validation", + importpath = "k8s.io/kubernetes/pkg/scheduler/api/validation", deps = [ - "//plugin/pkg/scheduler/api:go_default_library", + "//pkg/scheduler/api:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", ], ) @@ -20,8 +20,8 @@ go_test( name = "go_default_test", srcs = ["validation_test.go"], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/api/validation", - deps = ["//plugin/pkg/scheduler/api:go_default_library"], + importpath = "k8s.io/kubernetes/pkg/scheduler/api/validation", + deps = ["//pkg/scheduler/api:go_default_library"], ) filegroup( diff --git a/pkg/scheduler/core/BUILD b/pkg/scheduler/core/BUILD index ba8f787510..6b652164e8 100644 --- a/pkg/scheduler/core/BUILD +++ b/pkg/scheduler/core/BUILD @@ -15,16 +15,16 @@ go_test( "scheduling_queue_test.go", ], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/core", + importpath = "k8s.io/kubernetes/pkg/scheduler/core", deps = [ - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//plugin/pkg/scheduler/testing:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/algorithm/priorities:go_default_library", + "//pkg/scheduler/algorithm/priorities/util:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/testing:go_default_library", + "//pkg/scheduler/util:go_default_library", "//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", @@ -43,17 +43,17 @@ go_library( "generic_scheduler.go", "scheduling_queue.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/core", + importpath = "k8s.io/kubernetes/pkg/scheduler/core", deps = [ "//pkg/api/v1/pod:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/algorithm/priorities/util:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/util:go_default_library", + "//pkg/scheduler/volumebinder:go_default_library", "//pkg/util/hash:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", - "//plugin/pkg/scheduler/volumebinder:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/golang/groupcache/lru:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/scheduler/factory/BUILD b/pkg/scheduler/factory/BUILD index 4170027683..90645c5a22 100644 --- a/pkg/scheduler/factory/BUILD +++ b/pkg/scheduler/factory/BUILD @@ -12,22 +12,22 @@ go_library( "factory.go", "plugins.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/factory", + importpath = "k8s.io/kubernetes/pkg/scheduler/factory", deps = [ "//pkg/api/v1/pod:go_default_library", "//pkg/apis/core/helper:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/apis:go_default_library", - "//plugin/pkg/scheduler:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/api/validation:go_default_library", - "//plugin/pkg/scheduler/core:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", - "//plugin/pkg/scheduler/volumebinder:go_default_library", + "//pkg/scheduler:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/algorithm/priorities:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/api/validation:go_default_library", + "//pkg/scheduler/core:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/util:go_default_library", + "//pkg/scheduler/volumebinder:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/policy/v1beta1:go_default_library", @@ -63,17 +63,17 @@ go_test( "plugins_test.go", ], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/factory", + importpath = "k8s.io/kubernetes/pkg/scheduler/factory", deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/api/testing:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/api/latest:go_default_library", - "//plugin/pkg/scheduler/core:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//plugin/pkg/scheduler/testing:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/api/latest:go_default_library", + "//pkg/scheduler/core:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/testing:go_default_library", + "//pkg/scheduler/util:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/pkg/scheduler/metrics/BUILD b/pkg/scheduler/metrics/BUILD index 7d059ed211..81d6d19d58 100644 --- a/pkg/scheduler/metrics/BUILD +++ b/pkg/scheduler/metrics/BUILD @@ -8,7 +8,7 @@ load( go_library( name = "go_default_library", srcs = ["metrics.go"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/metrics", + importpath = "k8s.io/kubernetes/pkg/scheduler/metrics", deps = ["//vendor/github.com/prometheus/client_golang/prometheus:go_default_library"], ) diff --git a/pkg/scheduler/schedulercache/BUILD b/pkg/scheduler/schedulercache/BUILD index b8d18e6c42..19d35198f1 100644 --- a/pkg/scheduler/schedulercache/BUILD +++ b/pkg/scheduler/schedulercache/BUILD @@ -8,12 +8,12 @@ go_library( "node_info.go", "util.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache", + importpath = "k8s.io/kubernetes/pkg/scheduler/schedulercache", visibility = ["//visibility:public"], deps = [ "//pkg/apis/core/v1/helper:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", + "//pkg/scheduler/algorithm/priorities/util:go_default_library", + "//pkg/scheduler/util:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/policy/v1beta1:go_default_library", @@ -28,10 +28,10 @@ go_test( name = "go_default_test", srcs = ["cache_test.go"], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache", + importpath = "k8s.io/kubernetes/pkg/scheduler/schedulercache", deps = [ - "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", - "//plugin/pkg/scheduler/util:go_default_library", + "//pkg/scheduler/algorithm/priorities/util:go_default_library", + "//pkg/scheduler/util:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/policy/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/pkg/scheduler/testing/BUILD b/pkg/scheduler/testing/BUILD index 1a3d2c07d7..3b4b65c08d 100644 --- a/pkg/scheduler/testing/BUILD +++ b/pkg/scheduler/testing/BUILD @@ -12,10 +12,10 @@ go_library( "fake_lister.go", "pods_to_cache.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/testing", + importpath = "k8s.io/kubernetes/pkg/scheduler/testing", deps = [ - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", diff --git a/pkg/scheduler/util/BUILD b/pkg/scheduler/util/BUILD index 94174d181c..f333e8cd99 100644 --- a/pkg/scheduler/util/BUILD +++ b/pkg/scheduler/util/BUILD @@ -14,7 +14,7 @@ go_test( "utils_test.go", ], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/util", + importpath = "k8s.io/kubernetes/pkg/scheduler/util", deps = [ "//pkg/apis/scheduling:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", @@ -31,7 +31,7 @@ go_library( "testutil.go", "utils.go", ], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/util", + importpath = "k8s.io/kubernetes/pkg/scheduler/util", deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", diff --git a/pkg/scheduler/volumebinder/BUILD b/pkg/scheduler/volumebinder/BUILD index f942bfecdb..0656eeee27 100644 --- a/pkg/scheduler/volumebinder/BUILD +++ b/pkg/scheduler/volumebinder/BUILD @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["volume_binder.go"], - importpath = "k8s.io/kubernetes/plugin/pkg/scheduler/volumebinder", + importpath = "k8s.io/kubernetes/pkg/scheduler/volumebinder", visibility = ["//visibility:public"], deps = [ "//pkg/controller/volume/persistentvolume:go_default_library", diff --git a/plugin/BUILD b/plugin/BUILD index 03b7485610..2d7dd155c1 100644 --- a/plugin/BUILD +++ b/plugin/BUILD @@ -11,7 +11,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//plugin/cmd/kube-scheduler:all-srcs", "//plugin/pkg/admission/admit:all-srcs", "//plugin/pkg/admission/alwayspullimages:all-srcs", "//plugin/pkg/admission/antiaffinity:all-srcs", @@ -40,7 +39,6 @@ filegroup( "//plugin/pkg/admission/serviceaccount:all-srcs", "//plugin/pkg/admission/storageclass/setdefault:all-srcs", "//plugin/pkg/auth:all-srcs", - "//plugin/pkg/scheduler:all-srcs", ], tags = ["automanaged"], ) diff --git a/plugin/pkg/admission/defaulttolerationseconds/BUILD b/plugin/pkg/admission/defaulttolerationseconds/BUILD index fa601d0f0b..48ca06b3b8 100644 --- a/plugin/pkg/admission/defaulttolerationseconds/BUILD +++ b/plugin/pkg/admission/defaulttolerationseconds/BUILD @@ -14,7 +14,7 @@ go_test( deps = [ "//pkg/apis/core:go_default_library", "//pkg/apis/core/helper:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission:go_default_library", ], ) @@ -26,7 +26,7 @@ go_library( deps = [ "//pkg/apis/core:go_default_library", "//pkg/apis/core/helper:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission:go_default_library", ], diff --git a/plugin/pkg/admission/podtolerationrestriction/BUILD b/plugin/pkg/admission/podtolerationrestriction/BUILD index 2dd2627f14..9efce635d3 100644 --- a/plugin/pkg/admission/podtolerationrestriction/BUILD +++ b/plugin/pkg/admission/podtolerationrestriction/BUILD @@ -17,9 +17,9 @@ go_test( "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/informers/informers_generated/internalversion:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//pkg/util/tolerations:go_default_library", "//plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission:go_default_library", @@ -43,12 +43,12 @@ go_library( "//pkg/client/listers/core/internalversion:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//pkg/kubeapiserver/admission/util:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//pkg/util/tolerations:go_default_library", "//plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction:go_default_library", "//plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/install:go_default_library", "//plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1:go_default_library", "//plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/validation:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/test/e2e/apps/BUILD b/test/e2e/apps/BUILD index d7194290d6..6780918d0f 100644 --- a/test/e2e/apps/BUILD +++ b/test/e2e/apps/BUILD @@ -38,8 +38,8 @@ go_library( "//pkg/controller/replication:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/master/ports:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//pkg/util/pointer:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/utils:go_default_library", diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 9f7e222fed..0ecad57686 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -69,6 +69,8 @@ go_library( "//pkg/kubelet/util/format:go_default_library", "//pkg/kubemark:go_default_library", "//pkg/master/ports:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//pkg/security/podsecuritypolicy/seccomp:go_default_library", "//pkg/ssh:go_default_library", "//pkg/util/file:go_default_library", @@ -76,8 +78,6 @@ go_library( "//pkg/util/taints:go_default_library", "//pkg/util/version:go_default_library", "//pkg/volume/util/volumehelper:go_default_library", - "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", "//test/e2e/framework/ginkgowrapper:go_default_library", "//test/e2e/framework/metrics:go_default_library", "//test/e2e/manifest:go_default_library", diff --git a/test/e2e/scheduling/BUILD b/test/e2e/scheduling/BUILD index 64f27ed200..0a9d9bffa5 100644 --- a/test/e2e/scheduling/BUILD +++ b/test/e2e/scheduling/BUILD @@ -21,8 +21,8 @@ go_library( "//pkg/apis/core:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/quota/evaluator/core:go_default_library", + "//pkg/scheduler/algorithm/priorities/util:go_default_library", "//pkg/util/version:go_default_library", - "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/utils:go_default_library", diff --git a/test/integration/defaulttolerationseconds/BUILD b/test/integration/defaulttolerationseconds/BUILD index febfcd318e..85781840c3 100644 --- a/test/integration/defaulttolerationseconds/BUILD +++ b/test/integration/defaulttolerationseconds/BUILD @@ -20,8 +20,8 @@ go_test( deps = [ "//pkg/api/testapi:go_default_library", "//pkg/apis/core/helper:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", "//plugin/pkg/admission/defaulttolerationseconds:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", "//test/integration/framework:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/integration/scheduler/BUILD b/test/integration/scheduler/BUILD index ec4b7bb01a..8c627dfc7c 100644 --- a/test/integration/scheduler/BUILD +++ b/test/integration/scheduler/BUILD @@ -24,6 +24,7 @@ go_test( importpath = "k8s.io/kubernetes/test/integration/scheduler", tags = ["integration"], deps = [ + "//cmd/kube-scheduler/app:go_default_library", "//pkg/api/legacyscheme:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/apis/componentconfig:go_default_library", @@ -34,16 +35,15 @@ go_test( "//pkg/controller/volume/persistentvolume:go_default_library", "//pkg/features:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", - "//plugin/cmd/kube-scheduler/app:go_default_library", + "//pkg/scheduler:go_default_library", + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithmprovider:go_default_library", + "//pkg/scheduler/api:go_default_library", + "//pkg/scheduler/core:go_default_library", + "//pkg/scheduler/factory:go_default_library", + "//pkg/scheduler/schedulercache:go_default_library", "//plugin/pkg/admission/podtolerationrestriction:go_default_library", "//plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction:go_default_library", - "//plugin/pkg/scheduler:go_default_library", - "//plugin/pkg/scheduler/algorithm:go_default_library", - "//plugin/pkg/scheduler/algorithmprovider:go_default_library", - "//plugin/pkg/scheduler/api:go_default_library", - "//plugin/pkg/scheduler/core:go_default_library", - "//plugin/pkg/scheduler/factory:go_default_library", - "//plugin/pkg/scheduler/schedulercache:go_default_library", "//test/e2e/framework:go_default_library", "//test/integration/framework:go_default_library", "//test/utils:go_default_library", @@ -89,9 +89,9 @@ go_library( deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/api/v1/pod:go_default_library", - "//plugin/pkg/scheduler:go_default_library", - "//plugin/pkg/scheduler/algorithmprovider:go_default_library", - "//plugin/pkg/scheduler/factory:go_default_library", + "//pkg/scheduler:go_default_library", + "//pkg/scheduler/algorithmprovider:go_default_library", + "//pkg/scheduler/factory:go_default_library", "//test/integration/framework:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/test/integration/scheduler_perf/BUILD b/test/integration/scheduler_perf/BUILD index 56b23a44f7..1feb38464b 100644 --- a/test/integration/scheduler_perf/BUILD +++ b/test/integration/scheduler_perf/BUILD @@ -16,9 +16,9 @@ go_library( deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/api/testapi:go_default_library", - "//plugin/pkg/scheduler:go_default_library", - "//plugin/pkg/scheduler/algorithmprovider:go_default_library", - "//plugin/pkg/scheduler/factory:go_default_library", + "//pkg/scheduler:go_default_library", + "//pkg/scheduler/algorithmprovider:go_default_library", + "//pkg/scheduler/factory:go_default_library", "//test/integration/framework:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", @@ -43,7 +43,7 @@ go_test( tags = ["integration"], deps = [ "//pkg/kubelet/apis:go_default_library", - "//plugin/pkg/scheduler:go_default_library", + "//pkg/scheduler:go_default_library", "//test/integration/framework:go_default_library", "//test/utils:go_default_library", "//vendor/github.com/golang/glog:go_default_library",