diff --git a/cluster-autoscaler/config/dynamic/config_fetcher.go b/cluster-autoscaler/config/dynamic/config_fetcher.go index c17fcb13d6..186ceac2d1 100644 --- a/cluster-autoscaler/config/dynamic/config_fetcher.go +++ b/cluster-autoscaler/config/dynamic/config_fetcher.go @@ -19,9 +19,9 @@ package dynamic import ( "fmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + kube_record "k8s.io/client-go/tools/record" apiv1 "k8s.io/kubernetes/pkg/api/v1" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - kube_record "k8s.io/client-go/tools/record" ) // ConfigFetcher fetches the up-to-date dynamic configuration from the apiserver diff --git a/cluster-autoscaler/core/autoscaler.go b/cluster-autoscaler/core/autoscaler.go index 321963d7ee..9e6f8c68ad 100644 --- a/cluster-autoscaler/core/autoscaler.go +++ b/cluster-autoscaler/core/autoscaler.go @@ -19,11 +19,11 @@ package core import ( "time" - kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" 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" + kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" ) // AutoscalerOptions is the whole set of options for configuring an autoscaler diff --git a/cluster-autoscaler/core/autoscaler_test.go b/cluster-autoscaler/core/autoscaler_test.go index 20b1ca6355..d7fb51e4ef 100644 --- a/cluster-autoscaler/core/autoscaler_test.go +++ b/cluster-autoscaler/core/autoscaler_test.go @@ -17,21 +17,21 @@ limitations under the License. package core import ( - "testing" "fmt" + "testing" "time" "k8s.io/contrib/cluster-autoscaler/config/dynamic" + "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" - apiv1 "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" core "k8s.io/client-go/testing" - . "k8s.io/contrib/cluster-autoscaler/utils/test" - "github.com/stretchr/testify/assert" "k8s.io/contrib/cluster-autoscaler/simulator" kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" + . "k8s.io/contrib/cluster-autoscaler/utils/test" + apiv1 "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" ) func TestNewAutoscalerStatic(t *testing.T) { diff --git a/cluster-autoscaler/core/autoscaling_context.go b/cluster-autoscaler/core/autoscaling_context.go index 7c0f10482a..f473c47b20 100644 --- a/cluster-autoscaler/core/autoscaling_context.go +++ b/cluster-autoscaler/core/autoscaling_context.go @@ -19,14 +19,14 @@ package core import ( "time" - "k8s.io/contrib/cluster-autoscaler/cloudprovider/builder" - "k8s.io/contrib/cluster-autoscaler/expander" - "k8s.io/contrib/cluster-autoscaler/simulator" - kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" 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/expander" "k8s.io/contrib/cluster-autoscaler/expander/factory" + "k8s.io/contrib/cluster-autoscaler/simulator" + kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" ) // AutoscalingContext contains user-configurable constant and configuration-related objects passed to diff --git a/cluster-autoscaler/core/dynamic_autoscaler.go b/cluster-autoscaler/core/dynamic_autoscaler.go index d5b44b56b4..e976202faa 100644 --- a/cluster-autoscaler/core/dynamic_autoscaler.go +++ b/cluster-autoscaler/core/dynamic_autoscaler.go @@ -20,13 +20,13 @@ import ( "fmt" "time" + "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" - kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - kube_record "k8s.io/client-go/tools/record" - "github.com/golang/glog" "k8s.io/contrib/cluster-autoscaler/simulator" kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" + kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" ) // DynamicAutoscaler is a variant of autoscaler which supports dynamic reconfiguration at runtime diff --git a/cluster-autoscaler/core/scale_down.go b/cluster-autoscaler/core/scale_down.go index 39157cdb97..870003acda 100644 --- a/cluster-autoscaler/core/scale_down.go +++ b/cluster-autoscaler/core/scale_down.go @@ -30,9 +30,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + kube_record "k8s.io/client-go/tools/record" apiv1 "k8s.io/kubernetes/pkg/api/v1" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - kube_record "k8s.io/client-go/tools/record" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "github.com/golang/glog" diff --git a/cluster-autoscaler/core/scale_down_test.go b/cluster-autoscaler/core/scale_down_test.go index 3411512efd..b32f500ecc 100644 --- a/cluster-autoscaler/core/scale_down_test.go +++ b/cluster-autoscaler/core/scale_down_test.go @@ -21,18 +21,18 @@ import ( "testing" "time" + "k8s.io/apimachinery/pkg/api/errors" + 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/simulator" kube_util "k8s.io/contrib/cluster-autoscaler/utils/kubernetes" . "k8s.io/contrib/cluster-autoscaler/utils/test" - "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" apiv1 "k8s.io/kubernetes/pkg/api/v1" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - core "k8s.io/client-go/testing" "github.com/stretchr/testify/assert" ) diff --git a/cluster-autoscaler/core/scale_up_test.go b/cluster-autoscaler/core/scale_up_test.go index 1d7b82f344..5396269337 100644 --- a/cluster-autoscaler/core/scale_up_test.go +++ b/cluster-autoscaler/core/scale_up_test.go @@ -22,18 +22,18 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "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/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/apimachinery/pkg/runtime" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - core "k8s.io/client-go/testing" - "github.com/stretchr/testify/assert" - "k8s.io/contrib/cluster-autoscaler/estimator" ) func TestScaleUpOK(t *testing.T) { diff --git a/cluster-autoscaler/core/static_autoscaler.go b/cluster-autoscaler/core/static_autoscaler.go index 30d2bd0ab9..15c5ceb071 100644 --- a/cluster-autoscaler/core/static_autoscaler.go +++ b/cluster-autoscaler/core/static_autoscaler.go @@ -25,9 +25,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + kube_record "k8s.io/client-go/tools/record" apiv1 "k8s.io/kubernetes/pkg/api/v1" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - kube_record "k8s.io/client-go/tools/record" "github.com/golang/glog" "k8s.io/contrib/cluster-autoscaler/simulator" diff --git a/cluster-autoscaler/estimator/binpacking_estimator.go b/cluster-autoscaler/estimator/binpacking_estimator.go index f1ac9314b2..e1f48611b7 100644 --- a/cluster-autoscaler/estimator/binpacking_estimator.go +++ b/cluster-autoscaler/estimator/binpacking_estimator.go @@ -19,8 +19,8 @@ package estimator import ( "sort" - "k8s.io/contrib/cluster-autoscaler/simulator" "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/contrib/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 73fcc02c55..218949ddd0 100644 --- a/cluster-autoscaler/estimator/binpacking_estimator_test.go +++ b/cluster-autoscaler/estimator/binpacking_estimator_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" + "k8s.io/apimachinery/pkg/api/resource" "k8s.io/contrib/cluster-autoscaler/simulator" . "k8s.io/contrib/cluster-autoscaler/utils/test" - "k8s.io/apimachinery/pkg/api/resource" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" diff --git a/cluster-autoscaler/expander/waste/waste.go b/cluster-autoscaler/expander/waste/waste.go index 05c9f59720..52c7ef5c8d 100644 --- a/cluster-autoscaler/expander/waste/waste.go +++ b/cluster-autoscaler/expander/waste/waste.go @@ -18,9 +18,9 @@ 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/apimachinery/pkg/api/resource" 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 8d469b117d..12ab5fc4bc 100644 --- a/cluster-autoscaler/expander/waste/waste_test.go +++ b/cluster-autoscaler/expander/waste/waste_test.go @@ -23,8 +23,8 @@ import ( . "k8s.io/contrib/cluster-autoscaler/utils/test" "github.com/stretchr/testify/assert" - "k8s.io/contrib/cluster-autoscaler/expander" "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/contrib/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 9f0d3f3e72..05f30179cf 100644 --- a/cluster-autoscaler/main.go +++ b/cluster-autoscaler/main.go @@ -27,18 +27,18 @@ import ( "time" 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" 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" - kube_flag "k8s.io/apiserver/pkg/util/flag" - "k8s.io/contrib/cluster-autoscaler/estimator" - "k8s.io/contrib/cluster-autoscaler/metrics" - "k8s.io/contrib/cluster-autoscaler/simulator" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" diff --git a/cluster-autoscaler/simulator/nodes.go b/cluster-autoscaler/simulator/nodes.go index fcd918d49c..a41a624471 100644 --- a/cluster-autoscaler/simulator/nodes.go +++ b/cluster-autoscaler/simulator/nodes.go @@ -19,12 +19,12 @@ package simulator import ( "time" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/fields" "k8s.io/contrib/cluster-autoscaler/utils/drain" api "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kube_client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/apimachinery/pkg/fields" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) diff --git a/cluster-autoscaler/simulator/nodes_test.go b/cluster-autoscaler/simulator/nodes_test.go index 65b5c5ccec..993ec854f3 100644 --- a/cluster-autoscaler/simulator/nodes_test.go +++ b/cluster-autoscaler/simulator/nodes_test.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + core "k8s.io/client-go/testing" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/kubelet/types" "github.com/stretchr/testify/assert" diff --git a/cluster-autoscaler/simulator/predicates.go b/cluster-autoscaler/simulator/predicates.go index d409a42790..dee7da331a 100644 --- a/cluster-autoscaler/simulator/predicates.go +++ b/cluster-autoscaler/simulator/predicates.go @@ -22,11 +22,11 @@ import ( kube_util "k8s.io/contrib/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" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" "k8s.io/kubernetes/plugin/pkg/scheduler/factory" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" // We need to import provider to intialize default scheduler. _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" diff --git a/cluster-autoscaler/utils/deletetaint/delete_test.go b/cluster-autoscaler/utils/deletetaint/delete_test.go index 8c214593c3..e7db5f8098 100644 --- a/cluster-autoscaler/utils/deletetaint/delete_test.go +++ b/cluster-autoscaler/utils/deletetaint/delete_test.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" + core "k8s.io/client-go/testing" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - core "k8s.io/client-go/testing" "github.com/stretchr/testify/assert" ) diff --git a/cluster-autoscaler/utils/drain/drain_test.go b/cluster-autoscaler/utils/drain/drain_test.go index 9d5055fd8e..3103cc3b26 100644 --- a/cluster-autoscaler/utils/drain/drain_test.go +++ b/cluster-autoscaler/utils/drain/drain_test.go @@ -23,6 +23,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" api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" @@ -31,7 +32,6 @@ import ( batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - core "k8s.io/client-go/testing" ) func TestDrain(t *testing.T) { diff --git a/cluster-autoscaler/utils/kubernetes/factory.go b/cluster-autoscaler/utils/kubernetes/factory.go index 0348c0eec2..8be787d03d 100644 --- a/cluster-autoscaler/utils/kubernetes/factory.go +++ b/cluster-autoscaler/utils/kubernetes/factory.go @@ -17,13 +17,13 @@ limitations under the License. package kubernetes import ( - "k8s.io/kubernetes/pkg/api" - clientv1 "k8s.io/client-go/pkg/api/v1" v1core "k8s.io/client-go/kubernetes/typed/core/v1" + clientv1 "k8s.io/client-go/pkg/api/v1" kube_record "k8s.io/client-go/tools/record" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" - + "github.com/golang/glog" ) @@ -34,19 +34,5 @@ func CreateEventRecorder(kubeClient clientset.Interface) kube_record.EventRecord if _, isfake := kubeClient.(*fake.Clientset); !isfake { eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubeClient.Core().RESTClient()).Events("")}) } - return eventBroadcaster.NewRecorder(api.Scheme,clientv1.EventSource{Component: "cluster-autoscaler"}) -} - -type TestEventSink struct {} - -func (fes *TestEventSink) Create(event *clientv1.Event) (*clientv1.Event, error) { - return event, nil -} - -func (fes *TestEventSink) Update(event *clientv1.Event) (*clientv1.Event, error) { - return event, nil -} - -func (fes *TestEventSink) Patch(event *clientv1.Event, data []byte) (*clientv1.Event, error) { - return event, nil + return eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "cluster-autoscaler"}) } diff --git a/cluster-autoscaler/utils/kubernetes/listers.go b/cluster-autoscaler/utils/kubernetes/listers.go index 6b7e412e58..82e4490fd0 100644 --- a/cluster-autoscaler/utils/kubernetes/listers.go +++ b/cluster-autoscaler/utils/kubernetes/listers.go @@ -19,11 +19,11 @@ package kubernetes import ( "time" - "k8s.io/apimachinery/pkg/labels" - apiv1 "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/client-go/tools/cache" - client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/apimachinery/pkg/fields" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/client-go/tools/cache" + apiv1 "k8s.io/kubernetes/pkg/api/v1" + client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" v1lister "k8s.io/kubernetes/pkg/client/listers/core/v1" ) @@ -193,7 +193,7 @@ func (allNodeLister *AllNodeLister) List() ([]*apiv1.Node, error) { return []*apiv1.Node{}, err } allNodes := make([]*apiv1.Node, 0, len(nodes)) - for _,node := range nodes { + for _, node := range nodes { allNodes = append(allNodes, node) } return allNodes, nil diff --git a/cluster-autoscaler/utils/test/test_utils.go b/cluster-autoscaler/utils/test/test_utils.go index 08ad83008f..2c6a79d0f1 100644 --- a/cluster-autoscaler/utils/test/test_utils.go +++ b/cluster-autoscaler/utils/test/test_utils.go @@ -20,12 +20,12 @@ import ( "fmt" "time" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/kubernetes/pkg/api" - apiv1 "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" + apiv1 "k8s.io/kubernetes/pkg/api/v1" ) // BuildTestPod creates a pod with specified resources.