From 34eb4973f84f46ea6b4ea83f7317d5299ab2cae2 Mon Sep 17 00:00:00 2001 From: Marcin Wielgus Date: Tue, 18 Apr 2017 15:42:04 +0200 Subject: [PATCH] Fix imports in cluster autoscaler after migrating it from contrib --- .../cloudprovider/aws/aws_cloud_provider.go | 4 ++-- .../cloudprovider/azure/azure_cloud_provider.go | 2 +- .../builder/cloud_provider_builder.go | 8 ++++---- .../cloudprovider/gce/gce_cloud_provider.go | 4 ++-- .../cloudprovider/test/test_cloud_provider.go | 2 +- cluster-autoscaler/clusterstate/clusterstate.go | 8 ++++---- .../clusterstate/clusterstate_test.go | 6 +++--- cluster-autoscaler/core/autoscaler.go | 6 +++--- cluster-autoscaler/core/autoscaler_test.go | 8 ++++---- cluster-autoscaler/core/autoscaling_context.go | 14 +++++++------- cluster-autoscaler/core/dynamic_autoscaler.go | 8 ++++---- .../core/dynamic_autoscaler_test.go | 2 +- cluster-autoscaler/core/scale_down.go | 10 +++++----- cluster-autoscaler/core/scale_down_test.go | 12 ++++++------ cluster-autoscaler/core/scale_up.go | 6 +++--- cluster-autoscaler/core/scale_up_test.go | 16 ++++++++-------- cluster-autoscaler/core/static_autoscaler.go | 8 ++++---- cluster-autoscaler/core/utils.go | 6 +++--- cluster-autoscaler/core/utils_test.go | 8 ++++---- .../estimator/binpacking_estimator.go | 2 +- .../estimator/binpacking_estimator_test.go | 4 ++-- cluster-autoscaler/expander/expander.go | 2 +- .../expander/factory/expander_factory.go | 8 ++++---- cluster-autoscaler/expander/mostpods/mostpods.go | 4 ++-- .../expander/mostpods/mostpods_test.go | 2 +- cluster-autoscaler/expander/random/random.go | 2 +- .../expander/random/random_test.go | 2 +- cluster-autoscaler/expander/waste/waste.go | 4 ++-- cluster-autoscaler/expander/waste/waste_test.go | 4 ++-- cluster-autoscaler/main.go | 16 ++++++++-------- cluster-autoscaler/simulator/cluster_test.go | 2 +- cluster-autoscaler/simulator/drain.go | 2 +- cluster-autoscaler/simulator/nodes.go | 2 +- cluster-autoscaler/simulator/predicates.go | 2 +- cluster-autoscaler/simulator/predicates_test.go | 2 +- .../utils/deletetaint/delete_test.go | 2 +- cluster-autoscaler/utils/drain/drain_test.go | 2 +- 37 files changed, 101 insertions(+), 101 deletions(-) diff --git a/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go b/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go index afac514b95c..45a9741c2c6 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go @@ -21,8 +21,8 @@ import ( "regexp" "strings" - "k8s.io/contrib/cluster-autoscaler/cloudprovider" - "k8s.io/contrib/cluster-autoscaler/config/dynamic" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" apiv1 "k8s.io/kubernetes/pkg/api/v1" ) diff --git a/cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go b/cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go index 402bd84e739..f517aa2e785 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "k8s.io/contrib/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" apiv1 "k8s.io/kubernetes/pkg/api/v1" ) diff --git a/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go b/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go index e79e379bc64..5eb030194ba 100644 --- a/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go +++ b/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go @@ -18,10 +18,10 @@ package builder import ( "github.com/golang/glog" - "k8s.io/contrib/cluster-autoscaler/cloudprovider" - "k8s.io/contrib/cluster-autoscaler/cloudprovider/aws" - "k8s.io/contrib/cluster-autoscaler/cloudprovider/azure" - "k8s.io/contrib/cluster-autoscaler/cloudprovider/gce" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/gce" "os" ) diff --git a/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go b/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go index 822ffc321be..a01be532163 100644 --- a/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "k8s.io/contrib/cluster-autoscaler/cloudprovider" - "k8s.io/contrib/cluster-autoscaler/config/dynamic" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" apiv1 "k8s.io/kubernetes/pkg/api/v1" ) diff --git a/cluster-autoscaler/cloudprovider/test/test_cloud_provider.go b/cluster-autoscaler/cloudprovider/test/test_cloud_provider.go index 63c48aac72b..88e58e8703b 100644 --- a/cluster-autoscaler/cloudprovider/test/test_cloud_provider.go +++ b/cluster-autoscaler/cloudprovider/test/test_cloud_provider.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "k8s.io/contrib/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" apiv1 "k8s.io/kubernetes/pkg/api/v1" ) diff --git a/cluster-autoscaler/clusterstate/clusterstate.go b/cluster-autoscaler/clusterstate/clusterstate.go index 1cd9ae2ea58..9437c108d94 100644 --- a/cluster-autoscaler/clusterstate/clusterstate.go +++ b/cluster-autoscaler/clusterstate/clusterstate.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "k8s.io/contrib/cluster-autoscaler/cloudprovider" - "k8s.io/contrib/cluster-autoscaler/clusterstate/api" - "k8s.io/contrib/cluster-autoscaler/utils/deletetaint" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate/api" + "k8s.io/autoscaler/cluster-autoscaler/utils/deletetaint" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" diff --git a/cluster-autoscaler/clusterstate/clusterstate_test.go b/cluster-autoscaler/clusterstate/clusterstate_test.go index 81a18e2522d..99067f3c4cd 100644 --- a/cluster-autoscaler/clusterstate/clusterstate_test.go +++ b/cluster-autoscaler/clusterstate/clusterstate_test.go @@ -21,9 +21,9 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/contrib/cluster-autoscaler/cloudprovider/test" - "k8s.io/contrib/cluster-autoscaler/clusterstate/api" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/test" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate/api" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" "github.com/stretchr/testify/assert" diff --git a/cluster-autoscaler/core/autoscaler.go b/cluster-autoscaler/core/autoscaler.go index 9e6f8c68add..dd0a80e2c44 100644 --- a/cluster-autoscaler/core/autoscaler.go +++ b/cluster-autoscaler/core/autoscaler.go @@ -20,9 +20,9 @@ import ( "time" kube_record "k8s.io/client-go/tools/record" - "k8s.io/contrib/cluster-autoscaler/config/dynamic" - "k8s.io/contrib/cluster-autoscaler/simulator" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" + "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" + "k8s.io/autoscaler/cluster-autoscaler/simulator" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" ) diff --git a/cluster-autoscaler/core/autoscaler_test.go b/cluster-autoscaler/core/autoscaler_test.go index e4f4808814e..e3c2b216eaa 100644 --- a/cluster-autoscaler/core/autoscaler_test.go +++ b/cluster-autoscaler/core/autoscaler_test.go @@ -21,15 +21,15 @@ import ( "testing" "time" - "k8s.io/contrib/cluster-autoscaler/config/dynamic" + "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" core "k8s.io/client-go/testing" - "k8s.io/contrib/cluster-autoscaler/simulator" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + "k8s.io/autoscaler/cluster-autoscaler/simulator" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" ) diff --git a/cluster-autoscaler/core/autoscaling_context.go b/cluster-autoscaler/core/autoscaling_context.go index 8a1fa93896c..b38b48c0ae4 100644 --- a/cluster-autoscaler/core/autoscaling_context.go +++ b/cluster-autoscaler/core/autoscaling_context.go @@ -20,13 +20,13 @@ import ( "time" kube_record "k8s.io/client-go/tools/record" - "k8s.io/contrib/cluster-autoscaler/cloudprovider" - "k8s.io/contrib/cluster-autoscaler/cloudprovider/builder" - "k8s.io/contrib/cluster-autoscaler/clusterstate" - "k8s.io/contrib/cluster-autoscaler/clusterstate/utils" - "k8s.io/contrib/cluster-autoscaler/expander" - "k8s.io/contrib/cluster-autoscaler/expander/factory" - "k8s.io/contrib/cluster-autoscaler/simulator" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/builder" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate/utils" + "k8s.io/autoscaler/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/expander/factory" + "k8s.io/autoscaler/cluster-autoscaler/simulator" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" ) diff --git a/cluster-autoscaler/core/dynamic_autoscaler.go b/cluster-autoscaler/core/dynamic_autoscaler.go index e976202faa0..63ab65fa3d2 100644 --- a/cluster-autoscaler/core/dynamic_autoscaler.go +++ b/cluster-autoscaler/core/dynamic_autoscaler.go @@ -22,10 +22,10 @@ import ( "github.com/golang/glog" kube_record "k8s.io/client-go/tools/record" - "k8s.io/contrib/cluster-autoscaler/config/dynamic" - "k8s.io/contrib/cluster-autoscaler/metrics" - "k8s.io/contrib/cluster-autoscaler/simulator" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" + "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" + "k8s.io/autoscaler/cluster-autoscaler/metrics" + "k8s.io/autoscaler/cluster-autoscaler/simulator" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" ) diff --git a/cluster-autoscaler/core/dynamic_autoscaler_test.go b/cluster-autoscaler/core/dynamic_autoscaler_test.go index 0afb3e88b8a..2e081933f84 100644 --- a/cluster-autoscaler/core/dynamic_autoscaler_test.go +++ b/cluster-autoscaler/core/dynamic_autoscaler_test.go @@ -18,7 +18,7 @@ package core import ( "github.com/stretchr/testify/mock" - "k8s.io/contrib/cluster-autoscaler/config/dynamic" + "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" "testing" "time" ) diff --git a/cluster-autoscaler/core/scale_down.go b/cluster-autoscaler/core/scale_down.go index 4ee2394ffd9..ea514fd2c2b 100644 --- a/cluster-autoscaler/core/scale_down.go +++ b/cluster-autoscaler/core/scale_down.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "k8s.io/contrib/cluster-autoscaler/cloudprovider" - "k8s.io/contrib/cluster-autoscaler/clusterstate" - "k8s.io/contrib/cluster-autoscaler/simulator" - "k8s.io/contrib/cluster-autoscaler/utils/deletetaint" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate" + "k8s.io/autoscaler/cluster-autoscaler/simulator" + "k8s.io/autoscaler/cluster-autoscaler/utils/deletetaint" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cluster-autoscaler/core/scale_down_test.go b/cluster-autoscaler/core/scale_down_test.go index 34a90767c70..f2767fc36e0 100644 --- a/cluster-autoscaler/core/scale_down_test.go +++ b/cluster-autoscaler/core/scale_down_test.go @@ -26,12 +26,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" core "k8s.io/client-go/testing" - "k8s.io/contrib/cluster-autoscaler/cloudprovider/test" - "k8s.io/contrib/cluster-autoscaler/clusterstate" - "k8s.io/contrib/cluster-autoscaler/clusterstate/utils" - "k8s.io/contrib/cluster-autoscaler/simulator" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/test" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate/utils" + "k8s.io/autoscaler/cluster-autoscaler/simulator" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" policyv1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" diff --git a/cluster-autoscaler/core/scale_up.go b/cluster-autoscaler/core/scale_up.go index 3e773a7457e..a8bbe216085 100644 --- a/cluster-autoscaler/core/scale_up.go +++ b/cluster-autoscaler/core/scale_up.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "k8s.io/contrib/cluster-autoscaler/clusterstate" - "k8s.io/contrib/cluster-autoscaler/estimator" - "k8s.io/contrib/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate" + "k8s.io/autoscaler/cluster-autoscaler/estimator" + "k8s.io/autoscaler/cluster-autoscaler/expander" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" diff --git a/cluster-autoscaler/core/scale_up_test.go b/cluster-autoscaler/core/scale_up_test.go index f91106b66bf..906210a06e7 100644 --- a/cluster-autoscaler/core/scale_up_test.go +++ b/cluster-autoscaler/core/scale_up_test.go @@ -27,14 +27,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" core "k8s.io/client-go/testing" kube_record "k8s.io/client-go/tools/record" - "k8s.io/contrib/cluster-autoscaler/cloudprovider/test" - "k8s.io/contrib/cluster-autoscaler/clusterstate" - "k8s.io/contrib/cluster-autoscaler/clusterstate/utils" - "k8s.io/contrib/cluster-autoscaler/estimator" - "k8s.io/contrib/cluster-autoscaler/expander/random" - "k8s.io/contrib/cluster-autoscaler/simulator" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/test" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate/utils" + "k8s.io/autoscaler/cluster-autoscaler/estimator" + "k8s.io/autoscaler/cluster-autoscaler/expander/random" + "k8s.io/autoscaler/cluster-autoscaler/simulator" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" ) diff --git a/cluster-autoscaler/core/static_autoscaler.go b/cluster-autoscaler/core/static_autoscaler.go index 3a0b3898862..6640d1dde55 100644 --- a/cluster-autoscaler/core/static_autoscaler.go +++ b/cluster-autoscaler/core/static_autoscaler.go @@ -19,15 +19,15 @@ package core import ( "time" - "k8s.io/contrib/cluster-autoscaler/clusterstate/utils" - "k8s.io/contrib/cluster-autoscaler/metrics" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate/utils" + "k8s.io/autoscaler/cluster-autoscaler/metrics" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" kube_record "k8s.io/client-go/tools/record" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "github.com/golang/glog" - "k8s.io/contrib/cluster-autoscaler/simulator" + "k8s.io/autoscaler/cluster-autoscaler/simulator" ) // StaticAutoscaler is an autoscaler which has all the core functionality of a CA but without the reconfiguration feature diff --git a/cluster-autoscaler/core/utils.go b/cluster-autoscaler/core/utils.go index 73a48160a2c..9e138aaf268 100644 --- a/cluster-autoscaler/core/utils.go +++ b/cluster-autoscaler/core/utils.go @@ -21,9 +21,9 @@ import ( "reflect" "time" - "k8s.io/contrib/cluster-autoscaler/cloudprovider" - "k8s.io/contrib/cluster-autoscaler/clusterstate" - "k8s.io/contrib/cluster-autoscaler/simulator" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate" + "k8s.io/autoscaler/cluster-autoscaler/simulator" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" diff --git a/cluster-autoscaler/core/utils_test.go b/cluster-autoscaler/core/utils_test.go index 4e1b127f808..392c674df83 100644 --- a/cluster-autoscaler/core/utils_test.go +++ b/cluster-autoscaler/core/utils_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "k8s.io/contrib/cluster-autoscaler/cloudprovider/test" - "k8s.io/contrib/cluster-autoscaler/clusterstate" - "k8s.io/contrib/cluster-autoscaler/simulator" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/test" + "k8s.io/autoscaler/cluster-autoscaler/clusterstate" + "k8s.io/autoscaler/cluster-autoscaler/simulator" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" diff --git a/cluster-autoscaler/estimator/binpacking_estimator.go b/cluster-autoscaler/estimator/binpacking_estimator.go index e1f48611b7a..61f83659bcd 100644 --- a/cluster-autoscaler/estimator/binpacking_estimator.go +++ b/cluster-autoscaler/estimator/binpacking_estimator.go @@ -20,7 +20,7 @@ import ( "sort" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/contrib/cluster-autoscaler/simulator" + "k8s.io/autoscaler/cluster-autoscaler/simulator" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) diff --git a/cluster-autoscaler/estimator/binpacking_estimator_test.go b/cluster-autoscaler/estimator/binpacking_estimator_test.go index 218949ddd05..4d8313603b8 100644 --- a/cluster-autoscaler/estimator/binpacking_estimator_test.go +++ b/cluster-autoscaler/estimator/binpacking_estimator_test.go @@ -21,8 +21,8 @@ import ( "time" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/contrib/cluster-autoscaler/simulator" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + "k8s.io/autoscaler/cluster-autoscaler/simulator" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" diff --git a/cluster-autoscaler/expander/expander.go b/cluster-autoscaler/expander/expander.go index 1122dc9a8a2..20889a0d641 100644 --- a/cluster-autoscaler/expander/expander.go +++ b/cluster-autoscaler/expander/expander.go @@ -17,7 +17,7 @@ limitations under the License. package expander import ( - "k8s.io/contrib/cluster-autoscaler/cloudprovider" + "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) diff --git a/cluster-autoscaler/expander/factory/expander_factory.go b/cluster-autoscaler/expander/factory/expander_factory.go index 1d93649ac9e..df27df206ef 100644 --- a/cluster-autoscaler/expander/factory/expander_factory.go +++ b/cluster-autoscaler/expander/factory/expander_factory.go @@ -17,10 +17,10 @@ limitations under the License. package factory import ( - "k8s.io/contrib/cluster-autoscaler/expander" - "k8s.io/contrib/cluster-autoscaler/expander/mostpods" - "k8s.io/contrib/cluster-autoscaler/expander/random" - "k8s.io/contrib/cluster-autoscaler/expander/waste" + "k8s.io/autoscaler/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/expander/mostpods" + "k8s.io/autoscaler/cluster-autoscaler/expander/random" + "k8s.io/autoscaler/cluster-autoscaler/expander/waste" ) // ExpanderStrategyFromString creates an expander.Strategy according to its name diff --git a/cluster-autoscaler/expander/mostpods/mostpods.go b/cluster-autoscaler/expander/mostpods/mostpods.go index 703a51b4921..7e77e9b8996 100644 --- a/cluster-autoscaler/expander/mostpods/mostpods.go +++ b/cluster-autoscaler/expander/mostpods/mostpods.go @@ -17,8 +17,8 @@ limitations under the License. package mostpods import ( - "k8s.io/contrib/cluster-autoscaler/expander" - "k8s.io/contrib/cluster-autoscaler/expander/random" + "k8s.io/autoscaler/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/expander/random" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) diff --git a/cluster-autoscaler/expander/mostpods/mostpods_test.go b/cluster-autoscaler/expander/mostpods/mostpods_test.go index 7ed6ebb0171..0b796677ba3 100644 --- a/cluster-autoscaler/expander/mostpods/mostpods_test.go +++ b/cluster-autoscaler/expander/mostpods/mostpods_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "k8s.io/contrib/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/expander" apiv1 "k8s.io/kubernetes/pkg/api/v1" ) diff --git a/cluster-autoscaler/expander/random/random.go b/cluster-autoscaler/expander/random/random.go index 45ab472a75e..0199f02686c 100644 --- a/cluster-autoscaler/expander/random/random.go +++ b/cluster-autoscaler/expander/random/random.go @@ -19,7 +19,7 @@ package random import ( "math/rand" - "k8s.io/contrib/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/expander" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) diff --git a/cluster-autoscaler/expander/random/random_test.go b/cluster-autoscaler/expander/random/random_test.go index f33d9a226f5..557b212c759 100644 --- a/cluster-autoscaler/expander/random/random_test.go +++ b/cluster-autoscaler/expander/random/random_test.go @@ -19,7 +19,7 @@ package random import ( "testing" - "k8s.io/contrib/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/expander" "github.com/stretchr/testify/assert" ) diff --git a/cluster-autoscaler/expander/waste/waste.go b/cluster-autoscaler/expander/waste/waste.go index 52c7ef5c8db..5e25457c156 100644 --- a/cluster-autoscaler/expander/waste/waste.go +++ b/cluster-autoscaler/expander/waste/waste.go @@ -19,8 +19,8 @@ package waste import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/contrib/cluster-autoscaler/expander" - "k8s.io/contrib/cluster-autoscaler/expander/random" + "k8s.io/autoscaler/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/expander/random" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) diff --git a/cluster-autoscaler/expander/waste/waste_test.go b/cluster-autoscaler/expander/waste/waste_test.go index 12ab5fc4bc8..1c173ba2747 100644 --- a/cluster-autoscaler/expander/waste/waste_test.go +++ b/cluster-autoscaler/expander/waste/waste_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/contrib/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/expander" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) diff --git a/cluster-autoscaler/main.go b/cluster-autoscaler/main.go index f931ad2a64d..4f67ebe0ad4 100644 --- a/cluster-autoscaler/main.go +++ b/cluster-autoscaler/main.go @@ -28,14 +28,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kube_flag "k8s.io/apiserver/pkg/util/flag" - "k8s.io/contrib/cluster-autoscaler/config" - "k8s.io/contrib/cluster-autoscaler/config/dynamic" - "k8s.io/contrib/cluster-autoscaler/core" - "k8s.io/contrib/cluster-autoscaler/estimator" - "k8s.io/contrib/cluster-autoscaler/expander" - "k8s.io/contrib/cluster-autoscaler/metrics" - "k8s.io/contrib/cluster-autoscaler/simulator" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" + "k8s.io/autoscaler/cluster-autoscaler/config" + "k8s.io/autoscaler/cluster-autoscaler/config/dynamic" + "k8s.io/autoscaler/cluster-autoscaler/core" + "k8s.io/autoscaler/cluster-autoscaler/estimator" + "k8s.io/autoscaler/cluster-autoscaler/expander" + "k8s.io/autoscaler/cluster-autoscaler/metrics" + "k8s.io/autoscaler/cluster-autoscaler/simulator" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" kube_leaderelection "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" diff --git a/cluster-autoscaler/simulator/cluster_test.go b/cluster-autoscaler/simulator/cluster_test.go index d1974ff706f..ccffd4036d3 100644 --- a/cluster-autoscaler/simulator/cluster_test.go +++ b/cluster-autoscaler/simulator/cluster_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" diff --git a/cluster-autoscaler/simulator/drain.go b/cluster-autoscaler/simulator/drain.go index 94f474c84cc..5c030c64cbb 100644 --- a/cluster-autoscaler/simulator/drain.go +++ b/cluster-autoscaler/simulator/drain.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/contrib/cluster-autoscaler/utils/drain" + "k8s.io/autoscaler/cluster-autoscaler/utils/drain" api "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1" policyv1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" diff --git a/cluster-autoscaler/simulator/nodes.go b/cluster-autoscaler/simulator/nodes.go index a41a6244711..33efbf97092 100644 --- a/cluster-autoscaler/simulator/nodes.go +++ b/cluster-autoscaler/simulator/nodes.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" - "k8s.io/contrib/cluster-autoscaler/utils/drain" + "k8s.io/autoscaler/cluster-autoscaler/utils/drain" api "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/cluster-autoscaler/simulator/predicates.go b/cluster-autoscaler/simulator/predicates.go index dee7da331a3..523af053ed8 100644 --- a/cluster-autoscaler/simulator/predicates.go +++ b/cluster-autoscaler/simulator/predicates.go @@ -19,7 +19,7 @@ package simulator import ( "fmt" - kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" + kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" apiv1 "k8s.io/kubernetes/pkg/api/v1" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" diff --git a/cluster-autoscaler/simulator/predicates_test.go b/cluster-autoscaler/simulator/predicates_test.go index ebc35b4e08e..d483b90cd40 100644 --- a/cluster-autoscaler/simulator/predicates_test.go +++ b/cluster-autoscaler/simulator/predicates_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "github.com/stretchr/testify/assert" diff --git a/cluster-autoscaler/utils/deletetaint/delete_test.go b/cluster-autoscaler/utils/deletetaint/delete_test.go index 7e3540fff66..75f7a98ded0 100644 --- a/cluster-autoscaler/utils/deletetaint/delete_test.go +++ b/cluster-autoscaler/utils/deletetaint/delete_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" diff --git a/cluster-autoscaler/utils/drain/drain_test.go b/cluster-autoscaler/utils/drain/drain_test.go index 3103cc3b26f..8552062a170 100644 --- a/cluster-autoscaler/utils/drain/drain_test.go +++ b/cluster-autoscaler/utils/drain/drain_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" core "k8s.io/client-go/testing" - . "k8s.io/contrib/cluster-autoscaler/utils/test" + . "k8s.io/autoscaler/cluster-autoscaler/utils/test" api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apiv1 "k8s.io/kubernetes/pkg/api/v1"