From 30b89d830b7fd0827576853d6a0db44b66a90d3d Mon Sep 17 00:00:00 2001 From: Jonathan Basseri Date: Wed, 3 Jan 2018 18:12:18 -0800 Subject: [PATCH] Move scheduler code out of plugin directory. This moves plugin/pkg/scheduler to pkg/scheduler and plugin/cmd/kube-scheduler to cmd/kube-scheduler. Bulk of the work was done with gomvpkg, except for kube-scheduler main package. --- build/root/Makefile | 15 ---------- cmd/genkubedocs/gen_kube_docs.go | 2 +- cmd/genman/gen_kube_man.go | 2 +- cmd/hyperkube/kube-scheduler.go | 2 +- {plugin/cmd => cmd}/kube-scheduler/BUILD | 0 {plugin/cmd => cmd}/kube-scheduler/OWNERS | 0 {plugin/cmd => cmd}/kube-scheduler/app/BUILD | 0 .../cmd => cmd}/kube-scheduler/app/server.go | 10 +++---- .../cmd => cmd}/kube-scheduler/scheduler.go | 2 +- cmd/kubeadm/app/phases/addons/proxy/proxy.go | 2 +- cmd/kubeadm/app/preflight/checks.go | 2 +- examples/examples_test.go | 4 +-- hack/.golint_failures | 28 +++++++++---------- hack/lib/golang.sh | 2 +- hack/make-rules/make-help.sh | 16 ----------- pkg/controller/cloud/node_controller.go | 2 +- pkg/controller/cloud/node_controller_test.go | 2 +- pkg/controller/daemon/daemon_controller.go | 6 ++-- .../daemon/daemon_controller_test.go | 2 +- pkg/controller/daemon/util/daemonset_util.go | 2 +- .../node_lifecycle_controller.go | 2 +- .../node_lifecycle_controller_test.go | 2 +- pkg/kubectl/.import-restrictions | 15 +++++----- pkg/kubelet/cm/container_manager.go | 2 +- pkg/kubelet/cm/container_manager_linux.go | 2 +- pkg/kubelet/cm/container_manager_stub.go | 2 +- pkg/kubelet/cm/deviceplugin/manager.go | 2 +- pkg/kubelet/cm/deviceplugin/manager_stub.go | 2 +- pkg/kubelet/cm/deviceplugin/manager_test.go | 2 +- pkg/kubelet/cm/deviceplugin/types.go | 2 +- pkg/kubelet/eviction/helpers.go | 2 +- pkg/kubelet/kubelet.go | 2 +- pkg/kubelet/kubelet_node_status.go | 2 +- pkg/kubelet/kubelet_test.go | 2 +- .../admission_failure_handler_stub.go | 2 +- pkg/kubelet/lifecycle/predicate.go | 6 ++-- pkg/kubelet/preemption/preemption.go | 4 +-- {plugin/pkg => pkg}/scheduler/BUILD | 0 {plugin/pkg => pkg}/scheduler/OWNERS | 0 {plugin/pkg => pkg}/scheduler/algorithm/BUILD | 0 .../pkg => pkg}/scheduler/algorithm/doc.go | 2 +- .../scheduler/algorithm/predicates/BUILD | 0 .../scheduler/algorithm/predicates/error.go | 0 .../algorithm/predicates/metadata.go | 6 ++-- .../algorithm/predicates/metadata_test.go | 4 +-- .../algorithm/predicates/predicates.go | 10 +++---- .../algorithm/predicates/predicates_test.go | 8 +++--- .../algorithm/predicates/testing_helper.go | 0 .../scheduler/algorithm/predicates/utils.go | 4 +-- .../algorithm/predicates/utils_test.go | 0 .../scheduler/algorithm/priorities/BUILD | 0 .../balanced_resource_allocation.go | 4 +-- .../balanced_resource_allocation_test.go | 4 +-- .../algorithm/priorities/image_locality.go | 4 +-- .../priorities/image_locality_test.go | 4 +-- .../algorithm/priorities/interpod_affinity.go | 10 +++---- .../priorities/interpod_affinity_test.go | 6 ++-- .../algorithm/priorities/least_requested.go | 4 +-- .../priorities/least_requested_test.go | 4 +-- .../algorithm/priorities/metadata.go | 6 ++-- .../algorithm/priorities/metadata_test.go | 6 ++-- .../algorithm/priorities/most_requested.go | 4 +-- .../priorities/most_requested_test.go | 4 +-- .../algorithm/priorities/node_affinity.go | 4 +-- .../priorities/node_affinity_test.go | 4 +-- .../algorithm/priorities/node_label.go | 6 ++-- .../algorithm/priorities/node_label_test.go | 4 +-- .../priorities/node_prefer_avoid_pods.go | 6 ++-- .../priorities/node_prefer_avoid_pods_test.go | 4 +-- .../scheduler/algorithm/priorities/reduce.go | 6 ++-- .../priorities/resource_allocation.go | 6 ++-- .../algorithm/priorities/resource_limits.go | 4 +-- .../priorities/resource_limits_test.go | 4 +-- .../priorities/selector_spreading.go | 6 ++-- .../priorities/selector_spreading_test.go | 6 ++-- .../algorithm/priorities/taint_toleration.go | 4 +-- .../priorities/taint_toleration_test.go | 4 +-- .../algorithm/priorities/test_util.go | 6 ++-- .../scheduler/algorithm/priorities/util/BUILD | 0 .../algorithm/priorities/util/non_zero.go | 0 .../priorities/util/non_zero_test.go | 0 .../algorithm/priorities/util/topologies.go | 0 .../priorities/util/topologies_test.go | 0 .../algorithm/priorities/util/util.go | 0 .../algorithm/priorities/util/util_test.go | 0 .../algorithm/scheduler_interface.go | 4 +-- .../algorithm/scheduler_interface_test.go | 0 .../pkg => pkg}/scheduler/algorithm/types.go | 4 +-- .../scheduler/algorithm/types_test.go | 2 +- .../scheduler/algorithm/well_known_labels.go | 0 .../scheduler/algorithmprovider/BUILD | 0 .../algorithmprovider/defaults/BUILD | 0 .../defaults/compatibility_test.go | 6 ++-- .../algorithmprovider/defaults/defaults.go | 10 +++---- .../defaults/defaults_test.go | 2 +- .../scheduler/algorithmprovider/plugins.go | 2 +- .../algorithmprovider/plugins_test.go | 2 +- {plugin/pkg => pkg}/scheduler/api/BUILD | 0 {plugin/pkg => pkg}/scheduler/api/doc.go | 4 +-- .../pkg => pkg}/scheduler/api/latest/BUILD | 0 .../scheduler/api/latest/latest.go | 4 +-- {plugin/pkg => pkg}/scheduler/api/register.go | 0 {plugin/pkg => pkg}/scheduler/api/types.go | 0 {plugin/pkg => pkg}/scheduler/api/v1/BUILD | 0 {plugin/pkg => pkg}/scheduler/api/v1/doc.go | 4 +-- .../pkg => pkg}/scheduler/api/v1/register.go | 2 +- {plugin/pkg => pkg}/scheduler/api/v1/types.go | 0 .../scheduler/api/v1/zz_generated.deepcopy.go | 0 .../scheduler/api/validation/BUILD | 0 .../scheduler/api/validation/validation.go | 2 +- .../api/validation/validation_test.go | 2 +- .../scheduler/api/zz_generated.deepcopy.go | 0 {plugin/pkg => pkg}/scheduler/core/BUILD | 0 .../scheduler/core/equivalence_cache.go | 2 +- .../scheduler/core/equivalence_cache_test.go | 4 +-- .../pkg => pkg}/scheduler/core/extender.go | 6 ++-- .../scheduler/core/extender_test.go | 8 +++--- .../scheduler/core/generic_scheduler.go | 12 ++++---- .../scheduler/core/generic_scheduler_test.go | 18 ++++++------ .../scheduler/core/scheduling_queue.go | 6 ++-- .../scheduler/core/scheduling_queue_test.go | 2 +- {plugin/pkg => pkg}/scheduler/factory/BUILD | 0 .../pkg => pkg}/scheduler/factory/factory.go | 22 +++++++-------- .../scheduler/factory/factory_test.go | 14 +++++----- .../pkg => pkg}/scheduler/factory/plugins.go | 10 +++---- .../scheduler/factory/plugins_test.go | 4 +-- {plugin/pkg => pkg}/scheduler/metrics/BUILD | 0 .../pkg => pkg}/scheduler/metrics/metrics.go | 0 {plugin/pkg => pkg}/scheduler/scheduler.go | 16 +++++------ .../pkg => pkg}/scheduler/scheduler_test.go | 14 +++++----- .../scheduler/schedulercache/BUILD | 0 .../scheduler/schedulercache/cache.go | 0 .../scheduler/schedulercache/cache_test.go | 4 +-- .../scheduler/schedulercache/interface.go | 0 .../scheduler/schedulercache/node_info.go | 4 +-- .../scheduler/schedulercache/util.go | 0 {plugin/pkg => pkg}/scheduler/testing/BUILD | 0 .../scheduler/testing/fake_cache.go | 2 +- .../scheduler/testing/fake_lister.go | 4 +-- .../scheduler/testing/pods_to_cache.go | 2 +- {plugin/pkg => pkg}/scheduler/testutil.go | 8 +++--- {plugin/pkg => pkg}/scheduler/util/BUILD | 0 .../scheduler/util/backoff_utils.go | 0 .../scheduler/util/backoff_utils_test.go | 0 .../pkg => pkg}/scheduler/util/testutil.go | 0 .../scheduler/util/testutil_test.go | 0 {plugin/pkg => pkg}/scheduler/util/utils.go | 0 .../pkg => pkg}/scheduler/util/utils_test.go | 0 .../pkg => pkg}/scheduler/volumebinder/BUILD | 0 .../scheduler/volumebinder/volume_binder.go | 0 .../defaulttolerationseconds/admission.go | 2 +- .../admission_test.go | 2 +- .../podtolerationrestriction/admission.go | 2 +- .../admission_test.go | 2 +- test/e2e/apps/daemon_set.go | 2 +- test/e2e/framework/util.go | 4 +-- test/e2e/scheduling/priorities.go | 2 +- .../defaulttolerationseconds_test.go | 2 +- test/integration/scheduler/extender_test.go | 8 +++--- .../scheduler/local-pv-neg-affinity_test.go | 4 +-- test/integration/scheduler/preemption_test.go | 4 +-- test/integration/scheduler/scheduler_test.go | 14 +++++----- test/integration/scheduler/taint_test.go | 8 +++--- test/integration/scheduler/util.go | 6 ++-- .../scheduler_perf/scheduler_test.go | 2 +- test/integration/scheduler_perf/util.go | 6 ++-- test/test_owners.csv | 24 ++++++++-------- 167 files changed, 299 insertions(+), 329 deletions(-) rename {plugin/cmd => cmd}/kube-scheduler/BUILD (100%) rename {plugin/cmd => cmd}/kube-scheduler/OWNERS (100%) rename {plugin/cmd => cmd}/kube-scheduler/app/BUILD (100%) rename {plugin/cmd => cmd}/kube-scheduler/app/server.go (98%) rename {plugin/cmd => cmd}/kube-scheduler/scheduler.go (95%) rename {plugin/pkg => pkg}/scheduler/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/OWNERS (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/doc.go (89%) rename {plugin/pkg => pkg}/scheduler/algorithm/predicates/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/predicates/error.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/predicates/metadata.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithm/predicates/metadata_test.go (99%) rename {plugin/pkg => pkg}/scheduler/algorithm/predicates/predicates.go (99%) rename {plugin/pkg => pkg}/scheduler/algorithm/predicates/predicates_test.go (99%) rename {plugin/pkg => pkg}/scheduler/algorithm/predicates/testing_helper.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/predicates/utils.go (98%) rename {plugin/pkg => pkg}/scheduler/algorithm/predicates/utils_test.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/balanced_resource_allocation.go (95%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/balanced_resource_allocation_test.go (98%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/image_locality.go (96%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/image_locality_test.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/interpod_affinity.go (96%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/interpod_affinity_test.go (99%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/least_requested.go (93%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/least_requested_test.go (98%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/metadata.go (95%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/metadata_test.go (95%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/most_requested.go (94%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/most_requested_test.go (98%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/node_affinity.go (96%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/node_affinity_test.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/node_label.go (91%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/node_label_test.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/node_prefer_avoid_pods.go (91%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/reduce.go (89%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/resource_allocation.go (91%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/resource_limits.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/resource_limits_test.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/selector_spreading.go (98%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/selector_spreading_test.go (99%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/taint_toleration.go (96%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/taint_toleration_test.go (98%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/test_util.go (92%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/util/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/util/non_zero.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/util/non_zero_test.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/util/topologies.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/util/topologies_test.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/util/util.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/priorities/util/util_test.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/scheduler_interface.go (95%) rename {plugin/pkg => pkg}/scheduler/algorithm/scheduler_interface_test.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithm/types.go (98%) rename {plugin/pkg => pkg}/scheduler/algorithm/types_test.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithm/well_known_labels.go (100%) rename {plugin/pkg => pkg}/scheduler/algorithmprovider/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/algorithmprovider/defaults/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/algorithmprovider/defaults/compatibility_test.go (99%) rename {plugin/pkg => pkg}/scheduler/algorithmprovider/defaults/defaults.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithmprovider/defaults/defaults_test.go (97%) rename {plugin/pkg => pkg}/scheduler/algorithmprovider/plugins.go (91%) rename {plugin/pkg => pkg}/scheduler/algorithmprovider/plugins_test.go (98%) rename {plugin/pkg => pkg}/scheduler/api/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/api/doc.go (83%) rename {plugin/pkg => pkg}/scheduler/api/latest/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/api/latest/latest.go (94%) rename {plugin/pkg => pkg}/scheduler/api/register.go (100%) rename {plugin/pkg => pkg}/scheduler/api/types.go (100%) rename {plugin/pkg => pkg}/scheduler/api/v1/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/api/v1/doc.go (83%) rename {plugin/pkg => pkg}/scheduler/api/v1/register.go (96%) rename {plugin/pkg => pkg}/scheduler/api/v1/types.go (100%) rename {plugin/pkg => pkg}/scheduler/api/v1/zz_generated.deepcopy.go (100%) rename {plugin/pkg => pkg}/scheduler/api/validation/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/api/validation/validation.go (96%) rename {plugin/pkg => pkg}/scheduler/api/validation/validation_test.go (98%) rename {plugin/pkg => pkg}/scheduler/api/zz_generated.deepcopy.go (100%) rename {plugin/pkg => pkg}/scheduler/core/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/core/equivalence_cache.go (99%) rename {plugin/pkg => pkg}/scheduler/core/equivalence_cache_test.go (99%) rename {plugin/pkg => pkg}/scheduler/core/extender.go (97%) rename {plugin/pkg => pkg}/scheduler/core/extender_test.go (97%) rename {plugin/pkg => pkg}/scheduler/core/generic_scheduler.go (99%) rename {plugin/pkg => pkg}/scheduler/core/generic_scheduler_test.go (98%) rename {plugin/pkg => pkg}/scheduler/core/scheduling_queue.go (99%) rename {plugin/pkg => pkg}/scheduler/core/scheduling_queue_test.go (99%) rename {plugin/pkg => pkg}/scheduler/factory/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/factory/factory.go (98%) rename {plugin/pkg => pkg}/scheduler/factory/factory_test.go (97%) rename {plugin/pkg => pkg}/scheduler/factory/plugins.go (98%) rename {plugin/pkg => pkg}/scheduler/factory/plugins_test.go (95%) rename {plugin/pkg => pkg}/scheduler/metrics/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/metrics/metrics.go (100%) rename {plugin/pkg => pkg}/scheduler/scheduler.go (97%) rename {plugin/pkg => pkg}/scheduler/scheduler_test.go (98%) rename {plugin/pkg => pkg}/scheduler/schedulercache/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/schedulercache/cache.go (100%) rename {plugin/pkg => pkg}/scheduler/schedulercache/cache_test.go (99%) rename {plugin/pkg => pkg}/scheduler/schedulercache/interface.go (100%) rename {plugin/pkg => pkg}/scheduler/schedulercache/node_info.go (99%) rename {plugin/pkg => pkg}/scheduler/schedulercache/util.go (100%) rename {plugin/pkg => pkg}/scheduler/testing/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/testing/fake_cache.go (97%) rename {plugin/pkg => pkg}/scheduler/testing/fake_lister.go (98%) rename {plugin/pkg => pkg}/scheduler/testing/pods_to_cache.go (96%) rename {plugin/pkg => pkg}/scheduler/testutil.go (94%) rename {plugin/pkg => pkg}/scheduler/util/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/util/backoff_utils.go (100%) rename {plugin/pkg => pkg}/scheduler/util/backoff_utils_test.go (100%) rename {plugin/pkg => pkg}/scheduler/util/testutil.go (100%) rename {plugin/pkg => pkg}/scheduler/util/testutil_test.go (100%) rename {plugin/pkg => pkg}/scheduler/util/utils.go (100%) rename {plugin/pkg => pkg}/scheduler/util/utils_test.go (100%) rename {plugin/pkg => pkg}/scheduler/volumebinder/BUILD (100%) rename {plugin/pkg => pkg}/scheduler/volumebinder/volume_binder.go (100%) diff --git a/build/root/Makefile b/build/root/Makefile index ba50e2983e..23636241f9 100644 --- a/build/root/Makefile +++ b/build/root/Makefile @@ -466,21 +466,6 @@ $(filter-out %$(EXCLUDE_TARGET),$(notdir $(abspath $(wildcard cmd/*/)))): genera hack/make-rules/build.sh cmd/$@ endif -define PLUGIN_CMD_HELP_INFO -# Add rules for all directories in plugin/cmd/ -# -# Example: -# make kube-scheduler -endef -.PHONY: $(notdir $(abspath $(wildcard plugin/cmd/*/))) -ifeq ($(PRINT_HELP),y) -$(notdir $(abspath $(wildcard plugin/cmd/*/))): - @echo "$$PLUGIN_CMD_HELP_INFO" -else -$(notdir $(abspath $(wildcard plugin/cmd/*/))): generated_files - hack/make-rules/build.sh plugin/cmd/$@ -endif - define GENERATED_FILES_HELP_INFO # Produce auto-generated files needed for the build. # diff --git a/cmd/genkubedocs/gen_kube_docs.go b/cmd/genkubedocs/gen_kube_docs.go index 2285fe4d96..975466f441 100644 --- a/cmd/genkubedocs/gen_kube_docs.go +++ b/cmd/genkubedocs/gen_kube_docs.go @@ -27,9 +27,9 @@ import ( apiservapp "k8s.io/kubernetes/cmd/kube-apiserver/app" cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app" proxyapp "k8s.io/kubernetes/cmd/kube-proxy/app" + schapp "k8s.io/kubernetes/cmd/kube-scheduler/app" kubeadmapp "k8s.io/kubernetes/cmd/kubeadm/app/cmd" kubeletapp "k8s.io/kubernetes/cmd/kubelet/app" - schapp "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" ) func main() { diff --git a/cmd/genman/gen_kube_man.go b/cmd/genman/gen_kube_man.go index 182a2a1c14..416d4a9f9f 100644 --- a/cmd/genman/gen_kube_man.go +++ b/cmd/genman/gen_kube_man.go @@ -31,11 +31,11 @@ import ( apiservapp "k8s.io/kubernetes/cmd/kube-apiserver/app" cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app" proxyapp "k8s.io/kubernetes/cmd/kube-proxy/app" + schapp "k8s.io/kubernetes/cmd/kube-scheduler/app" kubeadmapp "k8s.io/kubernetes/cmd/kubeadm/app/cmd" kubeletapp "k8s.io/kubernetes/cmd/kubelet/app" kubectlcmd "k8s.io/kubernetes/pkg/kubectl/cmd" kubectlcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - schapp "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" ) func main() { diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go index cfd68dc15d..ba48aebb2b 100644 --- a/cmd/hyperkube/kube-scheduler.go +++ b/cmd/hyperkube/kube-scheduler.go @@ -20,7 +20,7 @@ import ( "flag" "k8s.io/apiserver/pkg/server/healthz" - "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" + "k8s.io/kubernetes/cmd/kube-scheduler/app" ) // NewScheduler creates a new hyperkube Server object that includes the diff --git a/plugin/cmd/kube-scheduler/BUILD b/cmd/kube-scheduler/BUILD similarity index 100% rename from plugin/cmd/kube-scheduler/BUILD rename to cmd/kube-scheduler/BUILD diff --git a/plugin/cmd/kube-scheduler/OWNERS b/cmd/kube-scheduler/OWNERS similarity index 100% rename from plugin/cmd/kube-scheduler/OWNERS rename to cmd/kube-scheduler/OWNERS diff --git a/plugin/cmd/kube-scheduler/app/BUILD b/cmd/kube-scheduler/app/BUILD similarity index 100% rename from plugin/cmd/kube-scheduler/app/BUILD rename to cmd/kube-scheduler/app/BUILD diff --git a/plugin/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go similarity index 98% rename from plugin/cmd/kube-scheduler/app/server.go rename to cmd/kube-scheduler/app/server.go index a304257248..a80a376f9f 100644 --- a/plugin/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -57,15 +57,15 @@ import ( "k8s.io/kubernetes/pkg/features" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/scheduler" + "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + latestschedulerapi "k8s.io/kubernetes/pkg/scheduler/api/latest" "k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/version/verflag" - "k8s.io/kubernetes/plugin/pkg/scheduler" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - latestschedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/scheduler/factory" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" diff --git a/plugin/cmd/kube-scheduler/scheduler.go b/cmd/kube-scheduler/scheduler.go similarity index 95% rename from plugin/cmd/kube-scheduler/scheduler.go rename to cmd/kube-scheduler/scheduler.go index 047ef86cff..1f6fcf7d60 100644 --- a/plugin/cmd/kube-scheduler/scheduler.go +++ b/cmd/kube-scheduler/scheduler.go @@ -21,9 +21,9 @@ import ( utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/apiserver/pkg/util/logs" + "k8s.io/kubernetes/cmd/kube-scheduler/app" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration - "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" ) func main() { diff --git a/cmd/kubeadm/app/phases/addons/proxy/proxy.go b/cmd/kubeadm/app/phases/addons/proxy/proxy.go index e8f71d11be..2f8f27e6d9 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/proxy.go +++ b/cmd/kubeadm/app/phases/addons/proxy/proxy.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/api/legacyscheme" kubeproxyconfigscheme "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/scheme" kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm" ) const ( diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index 8c53d700dc..48462b8067 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -44,6 +44,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" apiservoptions "k8s.io/kubernetes/cmd/kube-apiserver/app/options" cmoptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" + schedulerapp "k8s.io/kubernetes/cmd/kube-scheduler/app" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/pkg/apis/core/validation" @@ -52,7 +53,6 @@ import ( "k8s.io/kubernetes/pkg/util/initsystem" versionutil "k8s.io/kubernetes/pkg/util/version" kubeadmversion "k8s.io/kubernetes/pkg/version" - schedulerapp "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" "k8s.io/kubernetes/test/e2e_node/system" utilsexec "k8s.io/utils/exec" ) diff --git a/examples/examples_test.go b/examples/examples_test.go index c47be91a47..33ec647fff 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -42,8 +42,8 @@ import ( expvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/registry/batch/job" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - schedulerapilatest "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + schedulerapilatest "k8s.io/kubernetes/pkg/scheduler/api/latest" ) func validateObject(obj runtime.Object) (errors field.ErrorList) { diff --git a/hack/.golint_failures b/hack/.golint_failures index 1d88b07b7f..c7cd6939ad 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -3,6 +3,7 @@ cmd/gke-certificates-controller/app cmd/hyperkube cmd/kube-controller-manager/app cmd/kube-proxy/app +cmd/kube-scheduler/app cmd/kubeadm/app cmd/kubeadm/app/apis/kubeadm cmd/kubeadm/app/apis/kubeadm/v1alpha1 @@ -330,6 +331,19 @@ pkg/registry/storage/rest pkg/registry/storage/storageclass pkg/registry/storage/storageclass/storage pkg/routes +pkg/scheduler/algorithm +pkg/scheduler/algorithm/predicates +pkg/scheduler/algorithm/priorities +pkg/scheduler/algorithm/priorities/util +pkg/scheduler/api +pkg/scheduler/api/latest +pkg/scheduler/api/v1 +pkg/scheduler/core +pkg/scheduler/factory +pkg/scheduler/metrics +pkg/scheduler/schedulercache +pkg/scheduler/testing +pkg/scheduler/util pkg/security/apparmor pkg/security/podsecuritypolicy pkg/security/podsecuritypolicy/group @@ -399,7 +413,6 @@ pkg/volume/storageos pkg/volume/testing pkg/volume/util pkg/volume/vsphere_volume -plugin/cmd/kube-scheduler/app plugin/pkg/admission/antiaffinity plugin/pkg/admission/eventratelimit/apis/eventratelimit plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1 @@ -421,19 +434,6 @@ plugin/pkg/admission/serviceaccount plugin/pkg/admission/storageclass/setdefault plugin/pkg/auth/authorizer/node plugin/pkg/auth/authorizer/rbac -plugin/pkg/scheduler/algorithm -plugin/pkg/scheduler/algorithm/predicates -plugin/pkg/scheduler/algorithm/priorities -plugin/pkg/scheduler/algorithm/priorities/util -plugin/pkg/scheduler/api -plugin/pkg/scheduler/api/latest -plugin/pkg/scheduler/api/v1 -plugin/pkg/scheduler/core -plugin/pkg/scheduler/factory -plugin/pkg/scheduler/metrics -plugin/pkg/scheduler/schedulercache -plugin/pkg/scheduler/testing -plugin/pkg/scheduler/util staging/src/k8s.io/api/admission/v1beta1 staging/src/k8s.io/api/admissionregistration/v1alpha1 staging/src/k8s.io/api/admissionregistration/v1beta1 diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index b9649ce6d0..3e12b3170a 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -29,9 +29,9 @@ kube::golang::server_targets() { cmd/kubelet cmd/kubeadm cmd/hyperkube + cmd/kube-scheduler vendor/k8s.io/kube-aggregator vendor/k8s.io/apiextensions-apiserver - plugin/cmd/kube-scheduler cluster/gce/gci/mounter ) echo "${targets[@]}" diff --git a/hack/make-rules/make-help.sh b/hack/make-rules/make-help.sh index f1261955a8..e34c417086 100755 --- a/hack/make-rules/make-help.sh +++ b/hack/make-rules/make-help.sh @@ -24,7 +24,6 @@ readonly reset=$(tput sgr0) KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. ALL_TARGETS=$(make -C "${KUBE_ROOT}" PRINT_HELP=y -rpn | sed -n -e '/^$/ { n ; /^[^ .#][^ ]*:/ { s/:.*$// ; p ; } ; }' | sort) CMD_TARGETS=$(ls -l "${KUBE_ROOT}/cmd" |awk '/^d/ {print $NF}') -PLUGIN_CMD_TARGETS=$(ls -l "${KUBE_ROOT}/plugin/cmd" |awk '/^d/ {print $NF}') CMD_FLAG=false PLUGIN_CMD_FLAG=false @@ -45,21 +44,6 @@ for tar in $ALL_TARGETS; do fi done - for plugincmdtar in $PLUGIN_CMD_TARGETS; do - if [ $tar = $plugincmdtar ]; then - if [ $PLUGIN_CMD_FLAG = true ]; then - continue 2; - fi - - echo -e "${red}${PLUGIN_CMD_TARGETS}${reset}" - make -C "${KUBE_ROOT}" $tar PRINT_HELP=y - echo "---------------------------------------------------------------------------------" - - PLUGIN_CMD_FLAG=true - continue 2 - fi - done - echo -e "${red}${tar}${reset}" make -C "${KUBE_ROOT}" $tar PRINT_HELP=y echo "---------------------------------------------------------------------------------" diff --git a/pkg/controller/cloud/node_controller.go b/pkg/controller/cloud/node_controller.go index 5475e5858e..0f548e7d95 100644 --- a/pkg/controller/cloud/node_controller.go +++ b/pkg/controller/cloud/node_controller.go @@ -37,8 +37,8 @@ import ( nodeutilv1 "k8s.io/kubernetes/pkg/api/v1/node" "k8s.io/kubernetes/pkg/cloudprovider" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" + "k8s.io/kubernetes/pkg/scheduler/algorithm" nodeutil "k8s.io/kubernetes/pkg/util/node" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) var UpdateNodeSpecBackoff = wait.Backoff{ diff --git a/pkg/controller/cloud/node_controller_test.go b/pkg/controller/cloud/node_controller_test.go index 5e24914066..a8faf8352f 100644 --- a/pkg/controller/cloud/node_controller_test.go +++ b/pkg/controller/cloud/node_controller_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/testutil" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm" "github.com/golang/glog" "github.com/stretchr/testify/assert" diff --git a/pkg/controller/daemon/daemon_controller.go b/pkg/controller/daemon/daemon_controller.go index 72308b93b5..c316c52a93 100644 --- a/pkg/controller/daemon/daemon_controller.go +++ b/pkg/controller/daemon/daemon_controller.go @@ -54,10 +54,10 @@ import ( "k8s.io/kubernetes/pkg/controller/daemon/util" "k8s.io/kubernetes/pkg/features" kubelettypes "k8s.io/kubernetes/pkg/kubelet/types" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" "k8s.io/kubernetes/pkg/util/metrics" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "github.com/golang/glog" ) diff --git a/pkg/controller/daemon/daemon_controller_test.go b/pkg/controller/daemon/daemon_controller_test.go index 1a4ab365a3..cd5c4f0737 100644 --- a/pkg/controller/daemon/daemon_controller_test.go +++ b/pkg/controller/daemon/daemon_controller_test.go @@ -45,9 +45,9 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/controller" kubelettypes "k8s.io/kubernetes/pkg/kubelet/types" + "k8s.io/kubernetes/pkg/scheduler/algorithm" "k8s.io/kubernetes/pkg/securitycontext" labelsutil "k8s.io/kubernetes/pkg/util/labels" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) var ( diff --git a/pkg/controller/daemon/util/daemonset_util.go b/pkg/controller/daemon/util/daemonset_util.go index 1ea30b713f..3c69e8a3a0 100644 --- a/pkg/controller/daemon/util/daemonset_util.go +++ b/pkg/controller/daemon/util/daemonset_util.go @@ -27,8 +27,8 @@ import ( v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" kubelettypes "k8s.io/kubernetes/pkg/kubelet/types" + "k8s.io/kubernetes/pkg/scheduler/algorithm" labelsutil "k8s.io/kubernetes/pkg/util/labels" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) // CreatePodTemplate returns copy of provided template with additional diff --git a/pkg/controller/nodelifecycle/node_lifecycle_controller.go b/pkg/controller/nodelifecycle/node_lifecycle_controller.go index e2a47f2076..17f87bad29 100644 --- a/pkg/controller/nodelifecycle/node_lifecycle_controller.go +++ b/pkg/controller/nodelifecycle/node_lifecycle_controller.go @@ -44,12 +44,12 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/nodelifecycle/scheduler" nodeutil "k8s.io/kubernetes/pkg/controller/util/node" + "k8s.io/kubernetes/pkg/scheduler/algorithm" "k8s.io/kubernetes/pkg/util/metrics" utilnode "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/system" taintutils "k8s.io/kubernetes/pkg/util/taints" utilversion "k8s.io/kubernetes/pkg/util/version" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "fmt" "github.com/golang/glog" diff --git a/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go b/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go index 93affbb9d6..6813a0909d 100644 --- a/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go +++ b/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go @@ -42,9 +42,9 @@ import ( "k8s.io/kubernetes/pkg/controller/testutil" nodeutil "k8s.io/kubernetes/pkg/controller/util/node" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" + "k8s.io/kubernetes/pkg/scheduler/algorithm" "k8s.io/kubernetes/pkg/util/node" taintutils "k8s.io/kubernetes/pkg/util/taints" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) const ( diff --git a/pkg/kubectl/.import-restrictions b/pkg/kubectl/.import-restrictions index 875f997dd5..6d8fdf7cb8 100644 --- a/pkg/kubectl/.import-restrictions +++ b/pkg/kubectl/.import-restrictions @@ -117,6 +117,13 @@ "k8s.io/kubernetes/pkg/printers/internalversion", "k8s.io/kubernetes/pkg/registry/rbac/reconciliation", "k8s.io/kubernetes/pkg/registry/rbac/validation", + "k8s.io/kubernetes/pkg/scheduler/algorithm", + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates", + "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util", + "k8s.io/kubernetes/pkg/scheduler/api", + "k8s.io/kubernetes/pkg/scheduler/schedulercache", + "k8s.io/kubernetes/pkg/scheduler/util", + "k8s.io/kubernetes/pkg/scheduler/volumebinder", "k8s.io/kubernetes/pkg/security/apparmor", "k8s.io/kubernetes/pkg/serviceaccount", "k8s.io/kubernetes/pkg/util/file", @@ -137,13 +144,7 @@ "k8s.io/kubernetes/pkg/version", "k8s.io/kubernetes/pkg/version/prometheus", "k8s.io/kubernetes/pkg/volume", - "k8s.io/kubernetes/pkg/volume/util", - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm", - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates", - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util", - "k8s.io/kubernetes/plugin/pkg/scheduler/api", - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache", - "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/volume/util" ], "ForbiddenPrefixes": [] }] diff --git a/pkg/kubelet/cm/container_manager.go b/pkg/kubelet/cm/container_manager.go index da7bf4a464..fd61f2a751 100644 --- a/pkg/kubelet/cm/container_manager.go +++ b/pkg/kubelet/cm/container_manager.go @@ -28,7 +28,7 @@ import ( evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/status" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" "fmt" "strconv" diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 6c6c706817..f72ec699c9 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -52,13 +52,13 @@ import ( "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/qos" "k8s.io/kubernetes/pkg/kubelet/status" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" utilfile "k8s.io/kubernetes/pkg/util/file" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/procfs" utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" utilversion "k8s.io/kubernetes/pkg/util/version" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) const ( diff --git a/pkg/kubelet/cm/container_manager_stub.go b/pkg/kubelet/cm/container_manager_stub.go index 27a8684958..83df4cfaad 100644 --- a/pkg/kubelet/cm/container_manager_stub.go +++ b/pkg/kubelet/cm/container_manager_stub.go @@ -26,7 +26,7 @@ import ( kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/status" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) type containerManagerStub struct{} diff --git a/pkg/kubelet/cm/deviceplugin/manager.go b/pkg/kubelet/cm/deviceplugin/manager.go index df5e36e218..646dd65879 100644 --- a/pkg/kubelet/cm/deviceplugin/manager.go +++ b/pkg/kubelet/cm/deviceplugin/manager.go @@ -38,8 +38,8 @@ import ( "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/metrics" utilstore "k8s.io/kubernetes/pkg/kubelet/util/store" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" utilfs "k8s.io/kubernetes/pkg/util/filesystem" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) // ActivePodsFunc is a function that returns a list of pods to reconcile. diff --git a/pkg/kubelet/cm/deviceplugin/manager_stub.go b/pkg/kubelet/cm/deviceplugin/manager_stub.go index 903a0077a2..5d7a4b74c5 100644 --- a/pkg/kubelet/cm/deviceplugin/manager_stub.go +++ b/pkg/kubelet/cm/deviceplugin/manager_stub.go @@ -21,7 +21,7 @@ import ( pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" "k8s.io/kubernetes/pkg/kubelet/config" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // ManagerStub provides a simple stub implementation for the Device Manager. diff --git a/pkg/kubelet/cm/deviceplugin/manager_test.go b/pkg/kubelet/cm/deviceplugin/manager_test.go index 69699cf2d8..88147077c3 100644 --- a/pkg/kubelet/cm/deviceplugin/manager_test.go +++ b/pkg/kubelet/cm/deviceplugin/manager_test.go @@ -35,8 +35,8 @@ import ( pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" "k8s.io/kubernetes/pkg/kubelet/lifecycle" utilstore "k8s.io/kubernetes/pkg/kubelet/util/store" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" utilfs "k8s.io/kubernetes/pkg/util/filesystem" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) const ( diff --git a/pkg/kubelet/cm/deviceplugin/types.go b/pkg/kubelet/cm/deviceplugin/types.go index c4465a8be4..3c6b30206f 100644 --- a/pkg/kubelet/cm/deviceplugin/types.go +++ b/pkg/kubelet/cm/deviceplugin/types.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // Manager manages all the Device Plugins running on a node. diff --git a/pkg/kubelet/eviction/helpers.go b/pkg/kubelet/eviction/helpers.go index 8be0c49a28..3ae9c0306a 100644 --- a/pkg/kubelet/eviction/helpers.go +++ b/pkg/kubelet/eviction/helpers.go @@ -32,7 +32,7 @@ import ( evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" "k8s.io/kubernetes/pkg/kubelet/server/stats" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - schedulerutils "k8s.io/kubernetes/plugin/pkg/scheduler/util" + schedulerutils "k8s.io/kubernetes/pkg/scheduler/util" ) const ( diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index eb335301f3..2ed2dd9c7a 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -95,6 +95,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/util/queue" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils" "k8s.io/kubernetes/pkg/kubelet/volumemanager" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" "k8s.io/kubernetes/pkg/security/apparmor" utildbus "k8s.io/kubernetes/pkg/util/dbus" kubeio "k8s.io/kubernetes/pkg/util/io" @@ -103,7 +104,6 @@ import ( nodeutil "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" utilexec "k8s.io/utils/exec" ) diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index c775a665ac..7094b66f99 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -42,10 +42,10 @@ import ( "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils" + "k8s.io/kubernetes/pkg/scheduler/algorithm" nodeutil "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/volume/util/volumehelper" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) const ( diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 5019121d43..c1061355ba 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -67,12 +67,12 @@ import ( kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/queue" kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volumemanager" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" _ "k8s.io/kubernetes/pkg/volume/host_path" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util/volumehelper" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) func init() { diff --git a/pkg/kubelet/lifecycle/admission_failure_handler_stub.go b/pkg/kubelet/lifecycle/admission_failure_handler_stub.go index c98339782e..58e675e9a9 100644 --- a/pkg/kubelet/lifecycle/admission_failure_handler_stub.go +++ b/pkg/kubelet/lifecycle/admission_failure_handler_stub.go @@ -18,7 +18,7 @@ package lifecycle import ( "k8s.io/api/core/v1" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm" ) // AdmissionFailureHandlerStub is an AdmissionFailureHandler that does not perform any handling of admission failure. diff --git a/pkg/kubelet/lifecycle/predicate.go b/pkg/kubelet/lifecycle/predicate.go index 9b8ad4d3cc..e3890055f1 100644 --- a/pkg/kubelet/lifecycle/predicate.go +++ b/pkg/kubelet/lifecycle/predicate.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/kubelet/util/format" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) type getNodeAnyWayFuncType func() (*v1.Node, error) diff --git a/pkg/kubelet/preemption/preemption.go b/pkg/kubelet/preemption/preemption.go index 1f9214b830..96d829e4f8 100644 --- a/pkg/kubelet/preemption/preemption.go +++ b/pkg/kubelet/preemption/preemption.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/pkg/kubelet/lifecycle" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/format" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" ) const message = "Preempted in order to admit critical pod" diff --git a/plugin/pkg/scheduler/BUILD b/pkg/scheduler/BUILD similarity index 100% rename from plugin/pkg/scheduler/BUILD rename to pkg/scheduler/BUILD diff --git a/plugin/pkg/scheduler/OWNERS b/pkg/scheduler/OWNERS similarity index 100% rename from plugin/pkg/scheduler/OWNERS rename to pkg/scheduler/OWNERS diff --git a/plugin/pkg/scheduler/algorithm/BUILD b/pkg/scheduler/algorithm/BUILD similarity index 100% rename from plugin/pkg/scheduler/algorithm/BUILD rename to pkg/scheduler/algorithm/BUILD diff --git a/plugin/pkg/scheduler/algorithm/doc.go b/pkg/scheduler/algorithm/doc.go similarity index 89% rename from plugin/pkg/scheduler/algorithm/doc.go rename to pkg/scheduler/algorithm/doc.go index 299051b0f8..59c2cc4aa7 100644 --- a/plugin/pkg/scheduler/algorithm/doc.go +++ b/pkg/scheduler/algorithm/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package scheduler contains a generic Scheduler interface and several // implementations. -package algorithm // import "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" +package algorithm // import "k8s.io/kubernetes/pkg/scheduler/algorithm" diff --git a/plugin/pkg/scheduler/algorithm/predicates/BUILD b/pkg/scheduler/algorithm/predicates/BUILD similarity index 100% rename from plugin/pkg/scheduler/algorithm/predicates/BUILD rename to pkg/scheduler/algorithm/predicates/BUILD diff --git a/plugin/pkg/scheduler/algorithm/predicates/error.go b/pkg/scheduler/algorithm/predicates/error.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/predicates/error.go rename to pkg/scheduler/algorithm/predicates/error.go diff --git a/plugin/pkg/scheduler/algorithm/predicates/metadata.go b/pkg/scheduler/algorithm/predicates/metadata.go similarity index 97% rename from plugin/pkg/scheduler/algorithm/predicates/metadata.go rename to pkg/scheduler/algorithm/predicates/metadata.go index c0eda6a24d..af8c32e2c4 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/metadata.go +++ b/pkg/scheduler/algorithm/predicates/metadata.go @@ -22,9 +22,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedutil "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/algorithm/predicates/metadata_test.go b/pkg/scheduler/algorithm/predicates/metadata_test.go similarity index 99% rename from plugin/pkg/scheduler/algorithm/predicates/metadata_test.go rename to pkg/scheduler/algorithm/predicates/metadata_test.go index 0a96f5a0c9..31b8841101 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/metadata_test.go +++ b/pkg/scheduler/algorithm/predicates/metadata_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedulertesting "k8s.io/kubernetes/plugin/pkg/scheduler/testing" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing" ) // sortableAntiAffinityTerms lets us to sort anti-affinity terms. diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/pkg/scheduler/algorithm/predicates/predicates.go similarity index 99% rename from plugin/pkg/scheduler/algorithm/predicates/predicates.go rename to pkg/scheduler/algorithm/predicates/predicates.go index 67c4caf7b4..48d7b50928 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/pkg/scheduler/algorithm/predicates/predicates.go @@ -37,14 +37,14 @@ import ( v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos" "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" volumeutil "k8s.io/kubernetes/pkg/volume/util" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedutil "k8s.io/kubernetes/plugin/pkg/scheduler/util" "github.com/golang/glog" - "k8s.io/kubernetes/plugin/pkg/scheduler/volumebinder" + "k8s.io/kubernetes/pkg/scheduler/volumebinder" ) const ( diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go b/pkg/scheduler/algorithm/predicates/predicates_test.go similarity index 99% rename from plugin/pkg/scheduler/algorithm/predicates/predicates_test.go rename to pkg/scheduler/algorithm/predicates/predicates_test.go index 0ed3709e51..1b05d9e4fd 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go +++ b/pkg/scheduler/algorithm/predicates/predicates_test.go @@ -29,10 +29,10 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedulertesting "k8s.io/kubernetes/plugin/pkg/scheduler/testing" - schedutil "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" ) var ( diff --git a/plugin/pkg/scheduler/algorithm/predicates/testing_helper.go b/pkg/scheduler/algorithm/predicates/testing_helper.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/predicates/testing_helper.go rename to pkg/scheduler/algorithm/predicates/testing_helper.go diff --git a/plugin/pkg/scheduler/algorithm/predicates/utils.go b/pkg/scheduler/algorithm/predicates/utils.go similarity index 98% rename from plugin/pkg/scheduler/algorithm/predicates/utils.go rename to pkg/scheduler/algorithm/predicates/utils.go index 622bdc6835..9a25c85d9a 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/utils.go +++ b/pkg/scheduler/algorithm/predicates/utils.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - schedutil "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" ) // FindLabelsInSet gets as many key/value pairs as possible out of a label set. diff --git a/plugin/pkg/scheduler/algorithm/predicates/utils_test.go b/pkg/scheduler/algorithm/predicates/utils_test.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/predicates/utils_test.go rename to pkg/scheduler/algorithm/predicates/utils_test.go diff --git a/plugin/pkg/scheduler/algorithm/priorities/BUILD b/pkg/scheduler/algorithm/priorities/BUILD similarity index 100% rename from plugin/pkg/scheduler/algorithm/priorities/BUILD rename to pkg/scheduler/algorithm/priorities/BUILD diff --git a/plugin/pkg/scheduler/algorithm/priorities/balanced_resource_allocation.go b/pkg/scheduler/algorithm/priorities/balanced_resource_allocation.go similarity index 95% rename from plugin/pkg/scheduler/algorithm/priorities/balanced_resource_allocation.go rename to pkg/scheduler/algorithm/priorities/balanced_resource_allocation.go index c57bcbfc68..0f3d98f638 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/balanced_resource_allocation.go +++ b/pkg/scheduler/algorithm/priorities/balanced_resource_allocation.go @@ -19,8 +19,8 @@ package priorities import ( "math" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) var ( diff --git a/plugin/pkg/scheduler/algorithm/priorities/balanced_resource_allocation_test.go b/pkg/scheduler/algorithm/priorities/balanced_resource_allocation_test.go similarity index 98% rename from plugin/pkg/scheduler/algorithm/priorities/balanced_resource_allocation_test.go rename to pkg/scheduler/algorithm/priorities/balanced_resource_allocation_test.go index 381ff05307..9b109d109c 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/balanced_resource_allocation_test.go +++ b/pkg/scheduler/algorithm/priorities/balanced_resource_allocation_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func TestBalancedResourceAllocation(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/image_locality.go b/pkg/scheduler/algorithm/priorities/image_locality.go similarity index 96% rename from plugin/pkg/scheduler/algorithm/priorities/image_locality.go rename to pkg/scheduler/algorithm/priorities/image_locality.go index 86b3bb6c54..5df5d35308 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/image_locality.go +++ b/pkg/scheduler/algorithm/priorities/image_locality.go @@ -20,8 +20,8 @@ import ( "fmt" "k8s.io/api/core/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // This is a reasonable size range of all container images. 90%ile of images on dockerhub drops into this range. diff --git a/plugin/pkg/scheduler/algorithm/priorities/image_locality_test.go b/pkg/scheduler/algorithm/priorities/image_locality_test.go similarity index 97% rename from plugin/pkg/scheduler/algorithm/priorities/image_locality_test.go rename to pkg/scheduler/algorithm/priorities/image_locality_test.go index f957e86375..5a3bb66e79 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/image_locality_test.go +++ b/pkg/scheduler/algorithm/priorities/image_locality_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func TestImageLocalityPriority(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity.go b/pkg/scheduler/algorithm/priorities/interpod_affinity.go similarity index 96% rename from plugin/pkg/scheduler/algorithm/priorities/interpod_affinity.go rename to pkg/scheduler/algorithm/priorities/interpod_affinity.go index 16214ae100..59ed117f82 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity.go +++ b/pkg/scheduler/algorithm/priorities/interpod_affinity.go @@ -23,11 +23,11 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go b/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go similarity index 99% rename from plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go rename to pkg/scheduler/algorithm/priorities/interpod_affinity_test.go index 6dd3429927..6987e1d9ef 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go +++ b/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go @@ -23,9 +23,9 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedulertesting "k8s.io/kubernetes/plugin/pkg/scheduler/testing" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing" ) type FakeNodeListInfo []*v1.Node diff --git a/plugin/pkg/scheduler/algorithm/priorities/least_requested.go b/pkg/scheduler/algorithm/priorities/least_requested.go similarity index 93% rename from plugin/pkg/scheduler/algorithm/priorities/least_requested.go rename to pkg/scheduler/algorithm/priorities/least_requested.go index 39d3208f6f..0c2f0481f9 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/least_requested.go +++ b/pkg/scheduler/algorithm/priorities/least_requested.go @@ -17,8 +17,8 @@ limitations under the License. package priorities import ( - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) var ( diff --git a/plugin/pkg/scheduler/algorithm/priorities/least_requested_test.go b/pkg/scheduler/algorithm/priorities/least_requested_test.go similarity index 98% rename from plugin/pkg/scheduler/algorithm/priorities/least_requested_test.go rename to pkg/scheduler/algorithm/priorities/least_requested_test.go index f71ef43d1b..3b5308d7ba 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/least_requested_test.go +++ b/pkg/scheduler/algorithm/priorities/least_requested_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func TestLeastRequested(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/metadata.go b/pkg/scheduler/algorithm/priorities/metadata.go similarity index 95% rename from plugin/pkg/scheduler/algorithm/priorities/metadata.go rename to pkg/scheduler/algorithm/priorities/metadata.go index 3a4d783118..fe9dce79f4 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/metadata.go +++ b/pkg/scheduler/algorithm/priorities/metadata.go @@ -20,9 +20,9 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) type PriorityMetadataFactory struct { diff --git a/plugin/pkg/scheduler/algorithm/priorities/metadata_test.go b/pkg/scheduler/algorithm/priorities/metadata_test.go similarity index 95% rename from plugin/pkg/scheduler/algorithm/priorities/metadata_test.go rename to pkg/scheduler/algorithm/priorities/metadata_test.go index dbcb562598..ada1a3c46a 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/metadata_test.go +++ b/pkg/scheduler/algorithm/priorities/metadata_test.go @@ -25,9 +25,9 @@ import ( extensions "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedulertesting "k8s.io/kubernetes/plugin/pkg/scheduler/testing" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing" ) func TestPriorityMetadata(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/most_requested.go b/pkg/scheduler/algorithm/priorities/most_requested.go similarity index 94% rename from plugin/pkg/scheduler/algorithm/priorities/most_requested.go rename to pkg/scheduler/algorithm/priorities/most_requested.go index 9cba1a32ee..ed9053aa1e 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/most_requested.go +++ b/pkg/scheduler/algorithm/priorities/most_requested.go @@ -17,8 +17,8 @@ limitations under the License. package priorities import ( - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) var ( diff --git a/plugin/pkg/scheduler/algorithm/priorities/most_requested_test.go b/pkg/scheduler/algorithm/priorities/most_requested_test.go similarity index 98% rename from plugin/pkg/scheduler/algorithm/priorities/most_requested_test.go rename to pkg/scheduler/algorithm/priorities/most_requested_test.go index 0cffea5a33..4869ad85eb 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/most_requested_test.go +++ b/pkg/scheduler/algorithm/priorities/most_requested_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func TestMostRequested(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/node_affinity.go b/pkg/scheduler/algorithm/priorities/node_affinity.go similarity index 96% rename from plugin/pkg/scheduler/algorithm/priorities/node_affinity.go rename to pkg/scheduler/algorithm/priorities/node_affinity.go index 0ed713a3b5..d1c7935361 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/node_affinity.go +++ b/pkg/scheduler/algorithm/priorities/node_affinity.go @@ -22,8 +22,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // CalculateNodeAffinityPriority prioritizes nodes according to node affinity scheduling preferences diff --git a/plugin/pkg/scheduler/algorithm/priorities/node_affinity_test.go b/pkg/scheduler/algorithm/priorities/node_affinity_test.go similarity index 97% rename from plugin/pkg/scheduler/algorithm/priorities/node_affinity_test.go rename to pkg/scheduler/algorithm/priorities/node_affinity_test.go index f547413436..e7054b1514 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/node_affinity_test.go +++ b/pkg/scheduler/algorithm/priorities/node_affinity_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func TestNodeAffinityPriority(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/node_label.go b/pkg/scheduler/algorithm/priorities/node_label.go similarity index 91% rename from plugin/pkg/scheduler/algorithm/priorities/node_label.go rename to pkg/scheduler/algorithm/priorities/node_label.go index 7eef5a3bd7..8c1a86f590 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/node_label.go +++ b/pkg/scheduler/algorithm/priorities/node_label.go @@ -21,9 +21,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) type NodeLabelPrioritizer struct { diff --git a/plugin/pkg/scheduler/algorithm/priorities/node_label_test.go b/pkg/scheduler/algorithm/priorities/node_label_test.go similarity index 97% rename from plugin/pkg/scheduler/algorithm/priorities/node_label_test.go rename to pkg/scheduler/algorithm/priorities/node_label_test.go index 7acc6ea707..416fc9cc09 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/node_label_test.go +++ b/pkg/scheduler/algorithm/priorities/node_label_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func TestNewNodeLabelPriority(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go b/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go similarity index 91% rename from plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go rename to pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go index 7392f76b71..c0f4049082 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go +++ b/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go @@ -22,9 +22,9 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func CalculateNodePreferAvoidPodsPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (schedulerapi.HostPriority, error) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go b/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go similarity index 97% rename from plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go rename to pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go index 0766b9e548..8fb852fc6f 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go +++ b/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func TestNodePreferAvoidPriority(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/reduce.go b/pkg/scheduler/algorithm/priorities/reduce.go similarity index 89% rename from plugin/pkg/scheduler/algorithm/priorities/reduce.go rename to pkg/scheduler/algorithm/priorities/reduce.go index 9ce84fd9f6..608a83355e 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/reduce.go +++ b/pkg/scheduler/algorithm/priorities/reduce.go @@ -18,9 +18,9 @@ package priorities import ( "k8s.io/api/core/v1" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // NormalizeReduce generates a PriorityReduceFunction that can normalize the result diff --git a/plugin/pkg/scheduler/algorithm/priorities/resource_allocation.go b/pkg/scheduler/algorithm/priorities/resource_allocation.go similarity index 91% rename from plugin/pkg/scheduler/algorithm/priorities/resource_allocation.go rename to pkg/scheduler/algorithm/priorities/resource_allocation.go index 9723eff142..c938cedfdd 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/resource_allocation.go +++ b/pkg/scheduler/algorithm/priorities/resource_allocation.go @@ -21,9 +21,9 @@ import ( "github.com/golang/glog" "k8s.io/api/core/v1" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) type ResourceAllocationPriority struct { diff --git a/plugin/pkg/scheduler/algorithm/priorities/resource_limits.go b/pkg/scheduler/algorithm/priorities/resource_limits.go similarity index 97% rename from plugin/pkg/scheduler/algorithm/priorities/resource_limits.go rename to pkg/scheduler/algorithm/priorities/resource_limits.go index 77ae0dca92..3267368d2f 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/resource_limits.go +++ b/pkg/scheduler/algorithm/priorities/resource_limits.go @@ -21,8 +21,8 @@ import ( "k8s.io/api/core/v1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/algorithm/priorities/resource_limits_test.go b/pkg/scheduler/algorithm/priorities/resource_limits_test.go similarity index 97% rename from plugin/pkg/scheduler/algorithm/priorities/resource_limits_test.go rename to pkg/scheduler/algorithm/priorities/resource_limits_test.go index 0a48cc7330..e3056dcc6b 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/resource_limits_test.go +++ b/pkg/scheduler/algorithm/priorities/resource_limits_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" //metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func TestResourceLimistPriority(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go b/pkg/scheduler/algorithm/priorities/selector_spreading.go similarity index 98% rename from plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go rename to pkg/scheduler/algorithm/priorities/selector_spreading.go index 53c5c3719e..3b8eb60938 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go +++ b/pkg/scheduler/algorithm/priorities/selector_spreading.go @@ -21,10 +21,10 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" utilnode "k8s.io/kubernetes/pkg/util/node" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go b/pkg/scheduler/algorithm/priorities/selector_spreading_test.go similarity index 99% rename from plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go rename to pkg/scheduler/algorithm/priorities/selector_spreading_test.go index 85e547dae4..e6eff8cc27 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go +++ b/pkg/scheduler/algorithm/priorities/selector_spreading_test.go @@ -26,9 +26,9 @@ import ( extensions "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedulertesting "k8s.io/kubernetes/plugin/pkg/scheduler/testing" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing" ) func controllerRef(kind, name, uid string) []metav1.OwnerReference { diff --git a/plugin/pkg/scheduler/algorithm/priorities/taint_toleration.go b/pkg/scheduler/algorithm/priorities/taint_toleration.go similarity index 96% rename from plugin/pkg/scheduler/algorithm/priorities/taint_toleration.go rename to pkg/scheduler/algorithm/priorities/taint_toleration.go index 9e2905e8ed..c6847c0ea1 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/taint_toleration.go +++ b/pkg/scheduler/algorithm/priorities/taint_toleration.go @@ -21,8 +21,8 @@ import ( "k8s.io/api/core/v1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // CountIntolerableTaintsPreferNoSchedule gives the count of intolerable taints of a pod with effect PreferNoSchedule diff --git a/plugin/pkg/scheduler/algorithm/priorities/taint_toleration_test.go b/pkg/scheduler/algorithm/priorities/taint_toleration_test.go similarity index 98% rename from plugin/pkg/scheduler/algorithm/priorities/taint_toleration_test.go rename to pkg/scheduler/algorithm/priorities/taint_toleration_test.go index f54ce45613..3ef61dd987 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/taint_toleration_test.go +++ b/pkg/scheduler/algorithm/priorities/taint_toleration_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func nodeWithTaints(nodeName string, taints []v1.Taint) *v1.Node { diff --git a/plugin/pkg/scheduler/algorithm/priorities/test_util.go b/pkg/scheduler/algorithm/priorities/test_util.go similarity index 92% rename from plugin/pkg/scheduler/algorithm/priorities/test_util.go rename to pkg/scheduler/algorithm/priorities/test_util.go index 312c761941..d1756c0383 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/test_util.go +++ b/pkg/scheduler/algorithm/priorities/test_util.go @@ -20,9 +20,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) func makeNode(node string, milliCPU, memory int64) *v1.Node { diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/BUILD b/pkg/scheduler/algorithm/priorities/util/BUILD similarity index 100% rename from plugin/pkg/scheduler/algorithm/priorities/util/BUILD rename to pkg/scheduler/algorithm/priorities/util/BUILD diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/non_zero.go b/pkg/scheduler/algorithm/priorities/util/non_zero.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/priorities/util/non_zero.go rename to pkg/scheduler/algorithm/priorities/util/non_zero.go diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/non_zero_test.go b/pkg/scheduler/algorithm/priorities/util/non_zero_test.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/priorities/util/non_zero_test.go rename to pkg/scheduler/algorithm/priorities/util/non_zero_test.go diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go b/pkg/scheduler/algorithm/priorities/util/topologies.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/priorities/util/topologies.go rename to pkg/scheduler/algorithm/priorities/util/topologies.go diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/topologies_test.go b/pkg/scheduler/algorithm/priorities/util/topologies_test.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/priorities/util/topologies_test.go rename to pkg/scheduler/algorithm/priorities/util/topologies_test.go diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/util.go b/pkg/scheduler/algorithm/priorities/util/util.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/priorities/util/util.go rename to pkg/scheduler/algorithm/priorities/util/util.go diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/util_test.go b/pkg/scheduler/algorithm/priorities/util/util_test.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/priorities/util/util_test.go rename to pkg/scheduler/algorithm/priorities/util/util_test.go diff --git a/plugin/pkg/scheduler/algorithm/scheduler_interface.go b/pkg/scheduler/algorithm/scheduler_interface.go similarity index 95% rename from plugin/pkg/scheduler/algorithm/scheduler_interface.go rename to pkg/scheduler/algorithm/scheduler_interface.go index 5ef4fd6f40..d64e884260 100644 --- a/plugin/pkg/scheduler/algorithm/scheduler_interface.go +++ b/pkg/scheduler/algorithm/scheduler_interface.go @@ -18,8 +18,8 @@ package algorithm import ( "k8s.io/api/core/v1" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // SchedulerExtender is an interface for external processes to influence scheduling diff --git a/plugin/pkg/scheduler/algorithm/scheduler_interface_test.go b/pkg/scheduler/algorithm/scheduler_interface_test.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/scheduler_interface_test.go rename to pkg/scheduler/algorithm/scheduler_interface_test.go diff --git a/plugin/pkg/scheduler/algorithm/types.go b/pkg/scheduler/algorithm/types.go similarity index 98% rename from plugin/pkg/scheduler/algorithm/types.go rename to pkg/scheduler/algorithm/types.go index b3e34e0240..5fb2981f11 100644 --- a/plugin/pkg/scheduler/algorithm/types.go +++ b/pkg/scheduler/algorithm/types.go @@ -21,8 +21,8 @@ import ( "k8s.io/api/core/v1" extensions "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/labels" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // FitPredicate is a function that indicates if a pod fits into an existing node. diff --git a/plugin/pkg/scheduler/algorithm/types_test.go b/pkg/scheduler/algorithm/types_test.go similarity index 97% rename from plugin/pkg/scheduler/algorithm/types_test.go rename to pkg/scheduler/algorithm/types_test.go index 30b322caff..862425f721 100644 --- a/plugin/pkg/scheduler/algorithm/types_test.go +++ b/pkg/scheduler/algorithm/types_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // EmptyMetadataProducer should returns a no-op MetadataProducer type. diff --git a/plugin/pkg/scheduler/algorithm/well_known_labels.go b/pkg/scheduler/algorithm/well_known_labels.go similarity index 100% rename from plugin/pkg/scheduler/algorithm/well_known_labels.go rename to pkg/scheduler/algorithm/well_known_labels.go diff --git a/plugin/pkg/scheduler/algorithmprovider/BUILD b/pkg/scheduler/algorithmprovider/BUILD similarity index 100% rename from plugin/pkg/scheduler/algorithmprovider/BUILD rename to pkg/scheduler/algorithmprovider/BUILD diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD b/pkg/scheduler/algorithmprovider/defaults/BUILD similarity index 100% rename from plugin/pkg/scheduler/algorithmprovider/defaults/BUILD rename to pkg/scheduler/algorithmprovider/defaults/BUILD diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go b/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go similarity index 99% rename from plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go rename to pkg/scheduler/algorithmprovider/defaults/compatibility_test.go index 332fb4f679..77c421bc85 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go +++ b/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go @@ -31,9 +31,9 @@ import ( utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" _ "k8s.io/kubernetes/pkg/apis/core/install" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - latestschedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + latestschedulerapi "k8s.io/kubernetes/pkg/scheduler/api/latest" + "k8s.io/kubernetes/pkg/scheduler/factory" ) const enableEquivalenceCache = true diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go b/pkg/scheduler/algorithmprovider/defaults/defaults.go similarity index 97% rename from plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go rename to pkg/scheduler/algorithmprovider/defaults/defaults.go index 6ba618f395..6cbc772ac9 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go +++ b/pkg/scheduler/algorithmprovider/defaults/defaults.go @@ -21,11 +21,11 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities" - "k8s.io/kubernetes/plugin/pkg/scheduler/core" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities" + "k8s.io/kubernetes/pkg/scheduler/core" + "k8s.io/kubernetes/pkg/scheduler/factory" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults_test.go b/pkg/scheduler/algorithmprovider/defaults/defaults_test.go similarity index 97% rename from plugin/pkg/scheduler/algorithmprovider/defaults/defaults_test.go rename to pkg/scheduler/algorithmprovider/defaults/defaults_test.go index 16fc1b75e7..d78bb62835 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults_test.go +++ b/pkg/scheduler/algorithmprovider/defaults/defaults_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" ) func TestCopyAndReplace(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithmprovider/plugins.go b/pkg/scheduler/algorithmprovider/plugins.go similarity index 91% rename from plugin/pkg/scheduler/algorithmprovider/plugins.go rename to pkg/scheduler/algorithmprovider/plugins.go index f357a12d5a..e2784f6260 100644 --- a/plugin/pkg/scheduler/algorithmprovider/plugins.go +++ b/pkg/scheduler/algorithmprovider/plugins.go @@ -17,7 +17,7 @@ limitations under the License. package algorithmprovider import ( - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults" + "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults" ) // ApplyFeatureGates applies algorithm by feature gates. diff --git a/plugin/pkg/scheduler/algorithmprovider/plugins_test.go b/pkg/scheduler/algorithmprovider/plugins_test.go similarity index 98% rename from plugin/pkg/scheduler/algorithmprovider/plugins_test.go rename to pkg/scheduler/algorithmprovider/plugins_test.go index 4044bfa52c..16a1e8f5ac 100644 --- a/plugin/pkg/scheduler/algorithmprovider/plugins_test.go +++ b/pkg/scheduler/algorithmprovider/plugins_test.go @@ -20,7 +20,7 @@ import ( "testing" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/scheduler/factory" ) var ( diff --git a/plugin/pkg/scheduler/api/BUILD b/pkg/scheduler/api/BUILD similarity index 100% rename from plugin/pkg/scheduler/api/BUILD rename to pkg/scheduler/api/BUILD diff --git a/plugin/pkg/scheduler/api/doc.go b/pkg/scheduler/api/doc.go similarity index 83% rename from plugin/pkg/scheduler/api/doc.go rename to pkg/scheduler/api/doc.go index 28c5075457..c768a8c92c 100644 --- a/plugin/pkg/scheduler/api/doc.go +++ b/pkg/scheduler/api/doc.go @@ -16,5 +16,5 @@ limitations under the License. // +k8s:deepcopy-gen=package -// Package api contains scheduler plugin API objects. -package api // import "k8s.io/kubernetes/plugin/pkg/scheduler/api" +// Package api contains scheduler API objects. +package api // import "k8s.io/kubernetes/pkg/scheduler/api" diff --git a/plugin/pkg/scheduler/api/latest/BUILD b/pkg/scheduler/api/latest/BUILD similarity index 100% rename from plugin/pkg/scheduler/api/latest/BUILD rename to pkg/scheduler/api/latest/BUILD diff --git a/plugin/pkg/scheduler/api/latest/latest.go b/pkg/scheduler/api/latest/latest.go similarity index 94% rename from plugin/pkg/scheduler/api/latest/latest.go rename to pkg/scheduler/api/latest/latest.go index f225847737..4fa4bfb6cc 100644 --- a/plugin/pkg/scheduler/api/latest/latest.go +++ b/pkg/scheduler/api/latest/latest.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/runtime/serializer/versioning" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - _ "k8s.io/kubernetes/plugin/pkg/scheduler/api/v1" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + _ "k8s.io/kubernetes/pkg/scheduler/api/v1" ) // Version is the string that represents the current external default version. diff --git a/plugin/pkg/scheduler/api/register.go b/pkg/scheduler/api/register.go similarity index 100% rename from plugin/pkg/scheduler/api/register.go rename to pkg/scheduler/api/register.go diff --git a/plugin/pkg/scheduler/api/types.go b/pkg/scheduler/api/types.go similarity index 100% rename from plugin/pkg/scheduler/api/types.go rename to pkg/scheduler/api/types.go diff --git a/plugin/pkg/scheduler/api/v1/BUILD b/pkg/scheduler/api/v1/BUILD similarity index 100% rename from plugin/pkg/scheduler/api/v1/BUILD rename to pkg/scheduler/api/v1/BUILD diff --git a/plugin/pkg/scheduler/api/v1/doc.go b/pkg/scheduler/api/v1/doc.go similarity index 83% rename from plugin/pkg/scheduler/api/v1/doc.go rename to pkg/scheduler/api/v1/doc.go index 38679d991c..3386c4d8d2 100644 --- a/plugin/pkg/scheduler/api/v1/doc.go +++ b/pkg/scheduler/api/v1/doc.go @@ -16,5 +16,5 @@ limitations under the License. // +k8s:deepcopy-gen=package -// Package v1 contains scheduler plugin API objects. -package v1 // import "k8s.io/kubernetes/plugin/pkg/scheduler/api/v1" +// Package v1 contains scheduler API objects. +package v1 // import "k8s.io/kubernetes/pkg/scheduler/api/v1" diff --git a/plugin/pkg/scheduler/api/v1/register.go b/pkg/scheduler/api/v1/register.go similarity index 96% rename from plugin/pkg/scheduler/api/v1/register.go rename to pkg/scheduler/api/v1/register.go index 292245a0a6..0b45a6a2d0 100644 --- a/plugin/pkg/scheduler/api/v1/register.go +++ b/pkg/scheduler/api/v1/register.go @@ -19,7 +19,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" ) // SchemeGroupVersion is group version used to register these objects diff --git a/plugin/pkg/scheduler/api/v1/types.go b/pkg/scheduler/api/v1/types.go similarity index 100% rename from plugin/pkg/scheduler/api/v1/types.go rename to pkg/scheduler/api/v1/types.go diff --git a/plugin/pkg/scheduler/api/v1/zz_generated.deepcopy.go b/pkg/scheduler/api/v1/zz_generated.deepcopy.go similarity index 100% rename from plugin/pkg/scheduler/api/v1/zz_generated.deepcopy.go rename to pkg/scheduler/api/v1/zz_generated.deepcopy.go diff --git a/plugin/pkg/scheduler/api/validation/BUILD b/pkg/scheduler/api/validation/BUILD similarity index 100% rename from plugin/pkg/scheduler/api/validation/BUILD rename to pkg/scheduler/api/validation/BUILD diff --git a/plugin/pkg/scheduler/api/validation/validation.go b/pkg/scheduler/api/validation/validation.go similarity index 96% rename from plugin/pkg/scheduler/api/validation/validation.go rename to pkg/scheduler/api/validation/validation.go index cec33b1955..d8eb954c5f 100644 --- a/plugin/pkg/scheduler/api/validation/validation.go +++ b/pkg/scheduler/api/validation/validation.go @@ -20,7 +20,7 @@ import ( "fmt" utilerrors "k8s.io/apimachinery/pkg/util/errors" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" ) // ValidatePolicy checks for errors in the Config diff --git a/plugin/pkg/scheduler/api/validation/validation_test.go b/pkg/scheduler/api/validation/validation_test.go similarity index 98% rename from plugin/pkg/scheduler/api/validation/validation_test.go rename to pkg/scheduler/api/validation/validation_test.go index b0b01a8573..482bf92f66 100644 --- a/plugin/pkg/scheduler/api/validation/validation_test.go +++ b/pkg/scheduler/api/validation/validation_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "k8s.io/kubernetes/plugin/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/api" ) func TestValidatePolicy(t *testing.T) { diff --git a/plugin/pkg/scheduler/api/zz_generated.deepcopy.go b/pkg/scheduler/api/zz_generated.deepcopy.go similarity index 100% rename from plugin/pkg/scheduler/api/zz_generated.deepcopy.go rename to pkg/scheduler/api/zz_generated.deepcopy.go diff --git a/plugin/pkg/scheduler/core/BUILD b/pkg/scheduler/core/BUILD similarity index 100% rename from plugin/pkg/scheduler/core/BUILD rename to pkg/scheduler/core/BUILD diff --git a/plugin/pkg/scheduler/core/equivalence_cache.go b/pkg/scheduler/core/equivalence_cache.go similarity index 99% rename from plugin/pkg/scheduler/core/equivalence_cache.go rename to pkg/scheduler/core/equivalence_cache.go index ca27f40d57..5d9bda7eaf 100644 --- a/plugin/pkg/scheduler/core/equivalence_cache.go +++ b/pkg/scheduler/core/equivalence_cache.go @@ -22,8 +22,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/kubernetes/pkg/scheduler/algorithm" hashutil "k8s.io/kubernetes/pkg/util/hash" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "github.com/golang/glog" "github.com/golang/groupcache/lru" diff --git a/plugin/pkg/scheduler/core/equivalence_cache_test.go b/pkg/scheduler/core/equivalence_cache_test.go similarity index 99% rename from plugin/pkg/scheduler/core/equivalence_cache_test.go rename to pkg/scheduler/core/equivalence_cache_test.go index 3b098c1d2b..54b903e2fb 100644 --- a/plugin/pkg/scheduler/core/equivalence_cache_test.go +++ b/pkg/scheduler/core/equivalence_cache_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" ) type predicateItemType struct { diff --git a/plugin/pkg/scheduler/core/extender.go b/pkg/scheduler/core/extender.go similarity index 97% rename from plugin/pkg/scheduler/core/extender.go rename to pkg/scheduler/core/extender.go index 898ef4f452..0eb1e0def5 100644 --- a/plugin/pkg/scheduler/core/extender.go +++ b/pkg/scheduler/core/extender.go @@ -27,9 +27,9 @@ import ( "k8s.io/api/core/v1" utilnet "k8s.io/apimachinery/pkg/util/net" restclient "k8s.io/client-go/rest" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) const ( diff --git a/plugin/pkg/scheduler/core/extender_test.go b/pkg/scheduler/core/extender_test.go similarity index 97% rename from plugin/pkg/scheduler/core/extender_test.go rename to pkg/scheduler/core/extender_test.go index 3f389aff4d..23551a2415 100644 --- a/plugin/pkg/scheduler/core/extender_test.go +++ b/pkg/scheduler/core/extender_test.go @@ -24,10 +24,10 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedulertesting "k8s.io/kubernetes/plugin/pkg/scheduler/testing" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing" ) type fitPredicate func(pod *v1.Pod, node *v1.Node) (bool, error) diff --git a/plugin/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go similarity index 99% rename from plugin/pkg/scheduler/core/generic_scheduler.go rename to pkg/scheduler/core/generic_scheduler.go index f97e1e2feb..e1128c01cb 100644 --- a/plugin/pkg/scheduler/core/generic_scheduler.go +++ b/pkg/scheduler/core/generic_scheduler.go @@ -33,14 +33,14 @@ import ( utiltrace "k8s.io/apiserver/pkg/util/trace" corelisters "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/util/workqueue" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/util" "github.com/golang/glog" - "k8s.io/kubernetes/plugin/pkg/scheduler/volumebinder" + "k8s.io/kubernetes/pkg/scheduler/volumebinder" ) type FailedPredicateMap map[string][]algorithm.PredicateFailureReason diff --git a/plugin/pkg/scheduler/core/generic_scheduler_test.go b/pkg/scheduler/core/generic_scheduler_test.go similarity index 98% rename from plugin/pkg/scheduler/core/generic_scheduler_test.go rename to pkg/scheduler/core/generic_scheduler_test.go index 4c09ba6695..cdfc6b20fe 100644 --- a/plugin/pkg/scheduler/core/generic_scheduler_test.go +++ b/pkg/scheduler/core/generic_scheduler_test.go @@ -32,14 +32,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - algorithmpredicates "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - algorithmpriorities "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedulertesting "k8s.io/kubernetes/plugin/pkg/scheduler/testing" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + algorithmpredicates "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + algorithmpriorities "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing" ) var ( @@ -601,7 +601,7 @@ func TestZeroRequest(t *testing.T) { const expectedPriority int = 25 for _, test := range tests { // This should match the configuration in defaultPriorities() in - // plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go if you want + // pkg/scheduler/algorithmprovider/defaults/defaults.go if you want // to test what's actually in production. priorityConfigs := []algorithm.PriorityConfig{ {Map: algorithmpriorities.LeastRequestedPriorityMap, Weight: 1}, diff --git a/plugin/pkg/scheduler/core/scheduling_queue.go b/pkg/scheduler/core/scheduling_queue.go similarity index 99% rename from plugin/pkg/scheduler/core/scheduling_queue.go rename to pkg/scheduler/core/scheduling_queue.go index f258fd1ee7..79dfee0a1d 100644 --- a/plugin/pkg/scheduler/core/scheduling_queue.go +++ b/pkg/scheduler/core/scheduling_queue.go @@ -35,9 +35,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + "k8s.io/kubernetes/pkg/scheduler/util" "github.com/golang/glog" "reflect" diff --git a/plugin/pkg/scheduler/core/scheduling_queue_test.go b/pkg/scheduler/core/scheduling_queue_test.go similarity index 99% rename from plugin/pkg/scheduler/core/scheduling_queue_test.go rename to pkg/scheduler/core/scheduling_queue_test.go index cd3ba05db9..e69ae867cc 100644 --- a/plugin/pkg/scheduler/core/scheduling_queue_test.go +++ b/pkg/scheduler/core/scheduling_queue_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/util" ) var mediumPriority = (lowPriority + highPriority) / 2 diff --git a/plugin/pkg/scheduler/factory/BUILD b/pkg/scheduler/factory/BUILD similarity index 100% rename from plugin/pkg/scheduler/factory/BUILD rename to pkg/scheduler/factory/BUILD diff --git a/plugin/pkg/scheduler/factory/factory.go b/pkg/scheduler/factory/factory.go similarity index 98% rename from plugin/pkg/scheduler/factory/factory.go rename to pkg/scheduler/factory/factory.go index 45494fc73b..04b7a58591 100644 --- a/plugin/pkg/scheduler/factory/factory.go +++ b/pkg/scheduler/factory/factory.go @@ -15,7 +15,7 @@ limitations under the License. */ // Package factory can set up a scheduler. This code is here instead of -// plugin/cmd/scheduler for both testability and reuse. +// cmd/scheduler for both testability and reuse. package factory import ( @@ -54,15 +54,15 @@ import ( "k8s.io/kubernetes/pkg/apis/core/helper" "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" - "k8s.io/kubernetes/plugin/pkg/scheduler" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/api/validation" - "k8s.io/kubernetes/plugin/pkg/scheduler/core" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - "k8s.io/kubernetes/plugin/pkg/scheduler/util" - "k8s.io/kubernetes/plugin/pkg/scheduler/volumebinder" + "k8s.io/kubernetes/pkg/scheduler" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/api/validation" + "k8s.io/kubernetes/pkg/scheduler/core" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/volumebinder" ) const ( @@ -565,7 +565,7 @@ func (c *configFactory) addPodToCache(obj interface{}) { c.podQueue.AssignedPodAdded(pod) // NOTE: Updating equivalence cache of addPodToCache has been - // handled optimistically in: plugin/pkg/scheduler/scheduler.go#assume() + // handled optimistically in: pkg/scheduler/scheduler.go#assume() } func (c *configFactory) updatePodInCache(oldObj, newObj interface{}) { diff --git a/plugin/pkg/scheduler/factory/factory_test.go b/pkg/scheduler/factory/factory_test.go similarity index 97% rename from plugin/pkg/scheduler/factory/factory_test.go rename to pkg/scheduler/factory/factory_test.go index 92b0f271aa..7ca0dc36cd 100644 --- a/plugin/pkg/scheduler/factory/factory_test.go +++ b/pkg/scheduler/factory/factory_test.go @@ -33,13 +33,13 @@ import ( utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - latestschedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest" - "k8s.io/kubernetes/plugin/pkg/scheduler/core" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedulertesting "k8s.io/kubernetes/plugin/pkg/scheduler/testing" - "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + latestschedulerapi "k8s.io/kubernetes/pkg/scheduler/api/latest" + "k8s.io/kubernetes/pkg/scheduler/core" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing" + "k8s.io/kubernetes/pkg/scheduler/util" ) const enableEquivalenceCache = true diff --git a/plugin/pkg/scheduler/factory/plugins.go b/pkg/scheduler/factory/plugins.go similarity index 98% rename from plugin/pkg/scheduler/factory/plugins.go rename to pkg/scheduler/factory/plugins.go index a096030775..b8733d2961 100644 --- a/plugin/pkg/scheduler/factory/plugins.go +++ b/pkg/scheduler/factory/plugins.go @@ -24,13 +24,13 @@ import ( "sync" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" "github.com/golang/glog" - "k8s.io/kubernetes/plugin/pkg/scheduler/volumebinder" + "k8s.io/kubernetes/pkg/scheduler/volumebinder" ) // PluginFactoryArgs are passed to all plugin factory functions. diff --git a/plugin/pkg/scheduler/factory/plugins_test.go b/pkg/scheduler/factory/plugins_test.go similarity index 95% rename from plugin/pkg/scheduler/factory/plugins_test.go rename to pkg/scheduler/factory/plugins_test.go index 0f78fd1789..a3508c139d 100644 --- a/plugin/pkg/scheduler/factory/plugins_test.go +++ b/pkg/scheduler/factory/plugins_test.go @@ -19,8 +19,8 @@ package factory import ( "testing" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/api" ) func TestAlgorithmNameValidation(t *testing.T) { diff --git a/plugin/pkg/scheduler/metrics/BUILD b/pkg/scheduler/metrics/BUILD similarity index 100% rename from plugin/pkg/scheduler/metrics/BUILD rename to pkg/scheduler/metrics/BUILD diff --git a/plugin/pkg/scheduler/metrics/metrics.go b/pkg/scheduler/metrics/metrics.go similarity index 100% rename from plugin/pkg/scheduler/metrics/metrics.go rename to pkg/scheduler/metrics/metrics.go diff --git a/plugin/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go similarity index 97% rename from plugin/pkg/scheduler/scheduler.go rename to pkg/scheduler/scheduler.go index b58123eca2..9fae7d117f 100644 --- a/plugin/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -29,16 +29,16 @@ import ( corelisters "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/core" - "k8s.io/kubernetes/plugin/pkg/scheduler/metrics" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/core" + "k8s.io/kubernetes/pkg/scheduler/metrics" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/util" "github.com/golang/glog" - "k8s.io/kubernetes/plugin/pkg/scheduler/volumebinder" + "k8s.io/kubernetes/pkg/scheduler/volumebinder" ) // Binder knows how to write a binding. diff --git a/plugin/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go similarity index 98% rename from plugin/pkg/scheduler/scheduler_test.go rename to pkg/scheduler/scheduler_test.go index cc943f6c7a..73d4abcc28 100644 --- a/plugin/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -34,13 +34,13 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/controller/volume/persistentvolume" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "k8s.io/kubernetes/plugin/pkg/scheduler/core" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - schedulertesting "k8s.io/kubernetes/plugin/pkg/scheduler/testing" - "k8s.io/kubernetes/plugin/pkg/scheduler/util" - "k8s.io/kubernetes/plugin/pkg/scheduler/volumebinder" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/core" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" + schedulertesting "k8s.io/kubernetes/pkg/scheduler/testing" + "k8s.io/kubernetes/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/volumebinder" ) type fakeBinder struct { diff --git a/plugin/pkg/scheduler/schedulercache/BUILD b/pkg/scheduler/schedulercache/BUILD similarity index 100% rename from plugin/pkg/scheduler/schedulercache/BUILD rename to pkg/scheduler/schedulercache/BUILD diff --git a/plugin/pkg/scheduler/schedulercache/cache.go b/pkg/scheduler/schedulercache/cache.go similarity index 100% rename from plugin/pkg/scheduler/schedulercache/cache.go rename to pkg/scheduler/schedulercache/cache.go diff --git a/plugin/pkg/scheduler/schedulercache/cache_test.go b/pkg/scheduler/schedulercache/cache_test.go similarity index 99% rename from plugin/pkg/scheduler/schedulercache/cache_test.go rename to pkg/scheduler/schedulercache/cache_test.go index 9a10324393..b5e1243a47 100644 --- a/plugin/pkg/scheduler/schedulercache/cache_test.go +++ b/pkg/scheduler/schedulercache/cache_test.go @@ -29,8 +29,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - schedutil "k8s.io/kubernetes/plugin/pkg/scheduler/util" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" ) func deepEqualWithoutGeneration(t *testing.T, testcase int, actual, expected *NodeInfo) { diff --git a/plugin/pkg/scheduler/schedulercache/interface.go b/pkg/scheduler/schedulercache/interface.go similarity index 100% rename from plugin/pkg/scheduler/schedulercache/interface.go rename to pkg/scheduler/schedulercache/interface.go diff --git a/plugin/pkg/scheduler/schedulercache/node_info.go b/pkg/scheduler/schedulercache/node_info.go similarity index 99% rename from plugin/pkg/scheduler/schedulercache/node_info.go rename to pkg/scheduler/schedulercache/node_info.go index 99fb77430c..c59a2ebd68 100644 --- a/plugin/pkg/scheduler/schedulercache/node_info.go +++ b/pkg/scheduler/schedulercache/node_info.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" clientcache "k8s.io/client-go/tools/cache" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" - "k8s.io/kubernetes/plugin/pkg/scheduler/util" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + "k8s.io/kubernetes/pkg/scheduler/util" ) var emptyResource = Resource{} diff --git a/plugin/pkg/scheduler/schedulercache/util.go b/pkg/scheduler/schedulercache/util.go similarity index 100% rename from plugin/pkg/scheduler/schedulercache/util.go rename to pkg/scheduler/schedulercache/util.go diff --git a/plugin/pkg/scheduler/testing/BUILD b/pkg/scheduler/testing/BUILD similarity index 100% rename from plugin/pkg/scheduler/testing/BUILD rename to pkg/scheduler/testing/BUILD diff --git a/plugin/pkg/scheduler/testing/fake_cache.go b/pkg/scheduler/testing/fake_cache.go similarity index 97% rename from plugin/pkg/scheduler/testing/fake_cache.go rename to pkg/scheduler/testing/fake_cache.go index feeb048e52..be77503dd4 100644 --- a/plugin/pkg/scheduler/testing/fake_cache.go +++ b/pkg/scheduler/testing/fake_cache.go @@ -20,7 +20,7 @@ import ( "k8s.io/api/core/v1" policy "k8s.io/api/policy/v1beta1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // FakeCache is used for testing diff --git a/plugin/pkg/scheduler/testing/fake_lister.go b/pkg/scheduler/testing/fake_lister.go similarity index 98% rename from plugin/pkg/scheduler/testing/fake_lister.go rename to pkg/scheduler/testing/fake_lister.go index f01457a5bc..fdf5431fa2 100644 --- a/plugin/pkg/scheduler/testing/fake_lister.go +++ b/pkg/scheduler/testing/fake_lister.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corelisters "k8s.io/client-go/listers/core/v1" - . "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + . "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) var _ NodeLister = &FakeNodeLister{} diff --git a/plugin/pkg/scheduler/testing/pods_to_cache.go b/pkg/scheduler/testing/pods_to_cache.go similarity index 96% rename from plugin/pkg/scheduler/testing/pods_to_cache.go rename to pkg/scheduler/testing/pods_to_cache.go index 94f630b53c..2c5f6c6bf0 100644 --- a/plugin/pkg/scheduler/testing/pods_to_cache.go +++ b/pkg/scheduler/testing/pods_to_cache.go @@ -19,7 +19,7 @@ package testing import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" ) // PodsToCache is used for testing diff --git a/plugin/pkg/scheduler/testutil.go b/pkg/scheduler/testutil.go similarity index 94% rename from plugin/pkg/scheduler/testutil.go rename to pkg/scheduler/testutil.go index 7976353ed4..249ced16cd 100644 --- a/plugin/pkg/scheduler/testutil.go +++ b/pkg/scheduler/testutil.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" corelisters "k8s.io/client-go/listers/core/v1" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/core" - "k8s.io/kubernetes/plugin/pkg/scheduler/util" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/core" + "k8s.io/kubernetes/pkg/scheduler/util" ) // FakeConfigurator is an implementation for test. diff --git a/plugin/pkg/scheduler/util/BUILD b/pkg/scheduler/util/BUILD similarity index 100% rename from plugin/pkg/scheduler/util/BUILD rename to pkg/scheduler/util/BUILD diff --git a/plugin/pkg/scheduler/util/backoff_utils.go b/pkg/scheduler/util/backoff_utils.go similarity index 100% rename from plugin/pkg/scheduler/util/backoff_utils.go rename to pkg/scheduler/util/backoff_utils.go diff --git a/plugin/pkg/scheduler/util/backoff_utils_test.go b/pkg/scheduler/util/backoff_utils_test.go similarity index 100% rename from plugin/pkg/scheduler/util/backoff_utils_test.go rename to pkg/scheduler/util/backoff_utils_test.go diff --git a/plugin/pkg/scheduler/util/testutil.go b/pkg/scheduler/util/testutil.go similarity index 100% rename from plugin/pkg/scheduler/util/testutil.go rename to pkg/scheduler/util/testutil.go diff --git a/plugin/pkg/scheduler/util/testutil_test.go b/pkg/scheduler/util/testutil_test.go similarity index 100% rename from plugin/pkg/scheduler/util/testutil_test.go rename to pkg/scheduler/util/testutil_test.go diff --git a/plugin/pkg/scheduler/util/utils.go b/pkg/scheduler/util/utils.go similarity index 100% rename from plugin/pkg/scheduler/util/utils.go rename to pkg/scheduler/util/utils.go diff --git a/plugin/pkg/scheduler/util/utils_test.go b/pkg/scheduler/util/utils_test.go similarity index 100% rename from plugin/pkg/scheduler/util/utils_test.go rename to pkg/scheduler/util/utils_test.go diff --git a/plugin/pkg/scheduler/volumebinder/BUILD b/pkg/scheduler/volumebinder/BUILD similarity index 100% rename from plugin/pkg/scheduler/volumebinder/BUILD rename to pkg/scheduler/volumebinder/BUILD diff --git a/plugin/pkg/scheduler/volumebinder/volume_binder.go b/pkg/scheduler/volumebinder/volume_binder.go similarity index 100% rename from plugin/pkg/scheduler/volumebinder/volume_binder.go rename to pkg/scheduler/volumebinder/volume_binder.go diff --git a/plugin/pkg/admission/defaulttolerationseconds/admission.go b/plugin/pkg/admission/defaulttolerationseconds/admission.go index 05e170a96b..408ead36eb 100644 --- a/plugin/pkg/admission/defaulttolerationseconds/admission.go +++ b/plugin/pkg/admission/defaulttolerationseconds/admission.go @@ -25,7 +25,7 @@ import ( "k8s.io/apiserver/pkg/admission" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/core/helper" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm" ) var ( diff --git a/plugin/pkg/admission/defaulttolerationseconds/admission_test.go b/plugin/pkg/admission/defaulttolerationseconds/admission_test.go index 391d374882..b94e41fe5b 100644 --- a/plugin/pkg/admission/defaulttolerationseconds/admission_test.go +++ b/plugin/pkg/admission/defaulttolerationseconds/admission_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/apiserver/pkg/admission" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/core/helper" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm" ) func TestForgivenessAdmission(t *testing.T) { diff --git a/plugin/pkg/admission/podtolerationrestriction/admission.go b/plugin/pkg/admission/podtolerationrestriction/admission.go index 88345a2fbd..3318e221b2 100644 --- a/plugin/pkg/admission/podtolerationrestriction/admission.go +++ b/plugin/pkg/admission/podtolerationrestriction/admission.go @@ -35,10 +35,10 @@ import ( corelisters "k8s.io/kubernetes/pkg/client/listers/core/internalversion" kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" "k8s.io/kubernetes/pkg/kubeapiserver/admission/util" + "k8s.io/kubernetes/pkg/scheduler/algorithm" "k8s.io/kubernetes/pkg/util/tolerations" pluginapi "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction" pluginapiv1alpha1 "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) // Register registers a plugin diff --git a/plugin/pkg/admission/podtolerationrestriction/admission_test.go b/plugin/pkg/admission/podtolerationrestriction/admission_test.go index 45b1cb9478..1a60e5f213 100644 --- a/plugin/pkg/admission/podtolerationrestriction/admission_test.go +++ b/plugin/pkg/admission/podtolerationrestriction/admission_test.go @@ -30,9 +30,9 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" + "k8s.io/kubernetes/pkg/scheduler/algorithm" "k8s.io/kubernetes/pkg/util/tolerations" pluginapi "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) // TestPodAdmission verifies various scenarios involving pod/namespace tolerations diff --git a/test/e2e/apps/daemon_set.go b/test/e2e/apps/daemon_set.go index cd97d8f9df..a8090eaf2a 100644 --- a/test/e2e/apps/daemon_set.go +++ b/test/e2e/apps/daemon_set.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/daemon" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 58c01bf61d..637a9eace0 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -91,12 +91,12 @@ import ( "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubelet/util/format" "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" sshutil "k8s.io/kubernetes/pkg/ssh" "k8s.io/kubernetes/pkg/util/system" taintutils "k8s.io/kubernetes/pkg/util/taints" utilversion "k8s.io/kubernetes/pkg/util/version" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" testutil "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" diff --git a/test/e2e/scheduling/priorities.go b/test/e2e/scheduling/priorities.go index 4d0e27670b..1c34ea8998 100644 --- a/test/e2e/scheduling/priorities.go +++ b/test/e2e/scheduling/priorities.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" clientset "k8s.io/client-go/kubernetes" - priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" + priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" diff --git a/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go b/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go index 29832a9da6..463ec7641f 100644 --- a/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go +++ b/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go @@ -25,8 +25,8 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/core/helper" + "k8s.io/kubernetes/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/admission/defaulttolerationseconds" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go index 780c3a0376..74289507f0 100644 --- a/test/integration/scheduler/extender_test.go +++ b/test/integration/scheduler/extender_test.go @@ -38,10 +38,10 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/plugin/pkg/scheduler" - _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/scheduler" + _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/factory" e2e "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/scheduler/local-pv-neg-affinity_test.go b/test/integration/scheduler/local-pv-neg-affinity_test.go index 589089f1a3..f613bc9a3c 100644 --- a/test/integration/scheduler/local-pv-neg-affinity_test.go +++ b/test/integration/scheduler/local-pv-neg-affinity_test.go @@ -42,8 +42,8 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/controller/volume/persistentvolume" - "k8s.io/kubernetes/plugin/pkg/scheduler" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/scheduler" + "k8s.io/kubernetes/pkg/scheduler/factory" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/scheduler/preemption_test.go b/test/integration/scheduler/preemption_test.go index ca92dbae83..6ad507353a 100644 --- a/test/integration/scheduler/preemption_test.go +++ b/test/integration/scheduler/preemption_test.go @@ -33,8 +33,8 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/pkg/features" - _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" - "k8s.io/kubernetes/plugin/pkg/scheduler/core" + _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" + "k8s.io/kubernetes/pkg/scheduler/core" testutils "k8s.io/kubernetes/test/utils" "github.com/golang/glog" diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index a6e851e549..77770c59fd 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -39,16 +39,16 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" + schedulerapp "k8s.io/kubernetes/cmd/kube-scheduler/app" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/componentconfig" - schedulerapp "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" - "k8s.io/kubernetes/plugin/pkg/scheduler" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" - schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" - "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + "k8s.io/kubernetes/pkg/scheduler" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" + schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/scheduler/schedulercache" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/scheduler/taint_test.go b/test/integration/scheduler/taint_test.go index bb227ba4dd..bbdb6a7bd7 100644 --- a/test/integration/scheduler/taint_test.go +++ b/test/integration/scheduler/taint_test.go @@ -39,12 +39,12 @@ import ( internalinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion" "k8s.io/kubernetes/pkg/controller/nodelifecycle" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" + "k8s.io/kubernetes/pkg/scheduler" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" + "k8s.io/kubernetes/pkg/scheduler/factory" "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction" pluginapi "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction" - "k8s.io/kubernetes/plugin/pkg/scheduler" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/scheduler/util.go b/test/integration/scheduler/util.go index 4e66e0855c..1ccd34826e 100644 --- a/test/integration/scheduler/util.go +++ b/test/integration/scheduler/util.go @@ -35,9 +35,9 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api/legacyscheme" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - "k8s.io/kubernetes/plugin/pkg/scheduler" - _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/scheduler" + _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" + "k8s.io/kubernetes/pkg/scheduler/factory" "k8s.io/kubernetes/test/integration/framework" "net/http/httptest" diff --git a/test/integration/scheduler_perf/scheduler_test.go b/test/integration/scheduler_perf/scheduler_test.go index e6073377d7..4d13e22441 100644 --- a/test/integration/scheduler_perf/scheduler_test.go +++ b/test/integration/scheduler_perf/scheduler_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/kubernetes/plugin/pkg/scheduler" + "k8s.io/kubernetes/pkg/scheduler" testutils "k8s.io/kubernetes/test/utils" "math" "strconv" diff --git a/test/integration/scheduler_perf/util.go b/test/integration/scheduler_perf/util.go index 4e6a9025c9..ba5de428d5 100644 --- a/test/integration/scheduler_perf/util.go +++ b/test/integration/scheduler_perf/util.go @@ -29,9 +29,9 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/plugin/pkg/scheduler" - _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" - "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/scheduler" + _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" + "k8s.io/kubernetes/pkg/scheduler/factory" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/test_owners.csv b/test/test_owners.csv index 170579118d..a16928b5cb 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -515,11 +515,13 @@ Volumes NFS should be mountable,rrati,0,storage Volumes PD should be mountable,caesarxuchao,1,storage Volumes iSCSI should be mountable,jsafrane,1,storage Volumes vsphere should be mountable,jsafrane,0,storage +k8s.io/client-go/tools/leaderelection,xiang90,1, k8s.io/kubernetes/cmd/genutils,rmmh,1, k8s.io/kubernetes/cmd/hyperkube,jbeda,0, k8s.io/kubernetes/cmd/kube-apiserver/app/options,nikhiljindal,0, k8s.io/kubernetes/cmd/kube-controller-manager/app,dchen1107,1, k8s.io/kubernetes/cmd/kube-proxy/app,luxas,1, +k8s.io/kubernetes/cmd/kube-scheduler/app,deads2k,1, k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/install,ixdy,1, k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation,caesarxuchao,1, k8s.io/kubernetes/cmd/kubeadm/app/cmd,caesarxuchao,1, @@ -575,7 +577,6 @@ k8s.io/kubernetes/pkg/apis/rbac/validation,erictune,0, k8s.io/kubernetes/pkg/apis/storage/validation,caesarxuchao,1, k8s.io/kubernetes/pkg/auth/authorizer/abac,liggitt,0, k8s.io/kubernetes/pkg/client/chaosclient,deads2k,1, -k8s.io/client-go/tools/leaderelection,xiang90,1, k8s.io/kubernetes/pkg/client/legacylisters,jsafrane,1, k8s.io/kubernetes/pkg/client/listers/batch/internalversion,mqliang,0, k8s.io/kubernetes/pkg/client/listers/extensions/internalversion,eparis,1, @@ -760,6 +761,16 @@ k8s.io/kubernetes/pkg/registry/rbac/reconciliation,roberthbailey,1, k8s.io/kubernetes/pkg/registry/rbac/validation,rkouj,0, k8s.io/kubernetes/pkg/registry/storage/storageclass,brendandburns,1, k8s.io/kubernetes/pkg/registry/storage/storageclass/storage,wojtek-t,1, +k8s.io/kubernetes/pkg/scheduler,fgrzadkowski,0, +k8s.io/kubernetes/pkg/scheduler/algorithm/predicates,fgrzadkowski,0, +k8s.io/kubernetes/pkg/scheduler/algorithm/priorities,fgrzadkowski,0, +k8s.io/kubernetes/pkg/scheduler/algorithmprovider,fgrzadkowski,0, +k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults,fgrzadkowski,0, +k8s.io/kubernetes/pkg/scheduler/api/validation,fgrzadkowski,0, +k8s.io/kubernetes/pkg/scheduler/core,madhusudancs,1, +k8s.io/kubernetes/pkg/scheduler/factory,fgrzadkowski,0, +k8s.io/kubernetes/pkg/scheduler/schedulercache,fgrzadkowski,0, +k8s.io/kubernetes/pkg/scheduler/util,wojtek-t,1, k8s.io/kubernetes/pkg/security/apparmor,bgrant0607,1, k8s.io/kubernetes/pkg/security/podsecuritypolicy,erictune,0, k8s.io/kubernetes/pkg/security/podsecuritypolicy/apparmor,rrati,0, @@ -830,7 +841,6 @@ k8s.io/kubernetes/pkg/volume/util,saad-ali,0, k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations,freehan,1, k8s.io/kubernetes/pkg/volume/util/operationexecutor,rkouj,0, k8s.io/kubernetes/pkg/volume/vsphere_volume,deads2k,1, -k8s.io/kubernetes/plugin/cmd/kube-scheduler/app,deads2k,1, k8s.io/kubernetes/plugin/pkg/admission/admit,piosz,1, k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages,ncdc,1, k8s.io/kubernetes/plugin/pkg/admission/antiaffinity,timothysc,1, @@ -854,16 +864,6 @@ k8s.io/kubernetes/plugin/pkg/admission/serviceaccount,liggitt,0, k8s.io/kubernetes/plugin/pkg/admission/storageclass/default,pmorie,1, k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac,rrati,0, k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy,mml,1, -k8s.io/kubernetes/plugin/pkg/scheduler,fgrzadkowski,0, -k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates,fgrzadkowski,0, -k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities,fgrzadkowski,0, -k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider,fgrzadkowski,0, -k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults,fgrzadkowski,0, -k8s.io/kubernetes/plugin/pkg/scheduler/api/validation,fgrzadkowski,0, -k8s.io/kubernetes/plugin/pkg/scheduler/core,madhusudancs,1, -k8s.io/kubernetes/plugin/pkg/scheduler/factory,fgrzadkowski,0, -k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache,fgrzadkowski,0, -k8s.io/kubernetes/plugin/pkg/scheduler/util,wojtek-t,1, k8s.io/kubernetes/test/e2e,kevin-wangzefeng,1, k8s.io/kubernetes/test/e2e/chaosmonkey,pmorie,1, k8s.io/kubernetes/test/e2e_node,mml,1,