kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cluster-autoscaler: lint

This commit is contained in:
Marcin Wielgus 2017-03-02 15:07:09 +01:00
parent f648a575e6
commit 2ffaddb7c0
22 changed files with 50 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster-autoscaler/config/dynamic/config_fetcher.go
View File

@ -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

2
cluster-autoscaler/core/autoscaler.go
View File

@ -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

10
cluster-autoscaler/core/autoscaler_test.go
View File

@ -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) {

8
cluster-autoscaler/core/autoscaling_context.go
View File

@ -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

6
cluster-autoscaler/core/dynamic_autoscaler.go
View File

@ -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

2
cluster-autoscaler/core/scale_down.go
View File

@ -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"

8
cluster-autoscaler/core/scale_down_test.go
View File

@ -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"
)

8
cluster-autoscaler/core/scale_up_test.go
View File

@ -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) {

2
cluster-autoscaler/core/static_autoscaler.go
View File

@ -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"

2
cluster-autoscaler/estimator/binpacking_estimator.go
View File

@ -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"
)

2
cluster-autoscaler/estimator/binpacking_estimator_test.go
View File

@ -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"

2
cluster-autoscaler/expander/waste/waste.go
View File

@ -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"
)

2
cluster-autoscaler/expander/waste/waste_test.go
View File

@ -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"
)

8
cluster-autoscaler/main.go
View File

@ -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"

4
cluster-autoscaler/simulator/nodes.go
View File

@ -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"
)

2
cluster-autoscaler/simulator/nodes_test.go
View File

@ -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"

2
cluster-autoscaler/simulator/predicates.go
View File

@ -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"

2
cluster-autoscaler/utils/deletetaint/delete_test.go
View File

@ -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"
)

2
cluster-autoscaler/utils/drain/drain_test.go
View File

@ -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) {

20
cluster-autoscaler/utils/kubernetes/factory.go
View File

@ -17,10 +17,10 @@ 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"
@ -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"})
}

10
cluster-autoscaler/utils/kubernetes/listers.go
View File

@ -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

6
cluster-autoscaler/utils/test/test_utils.go
View File

@ -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.