Skip to content

Commit

Permalink
Merge pull request #1 from mwielgus/fix-imports
Browse files Browse the repository at this point in the history 
Fix imports in cluster autoscaler after migrating it from contrib
  • Loading branch information
@mwielgus
mwielgus authored Apr 18, 2017
2 parents 9a5fbfb + 34eb497 commit 55db148
Show file tree
Hide file tree
Showing 37 changed files with 101 additions and 101 deletions.
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/cloudprovider/test/test_cloud_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions cluster-autoscaler/clusterstate/clusterstate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cluster-autoscaler/clusterstate/clusterstate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cluster-autoscaler/core/autoscaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions cluster-autoscaler/core/autoscaler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
14 changes: 7 additions & 7 deletions cluster-autoscaler/core/autoscaling_context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions cluster-autoscaler/core/dynamic_autoscaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/core/dynamic_autoscaler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
10 changes: 5 additions & 5 deletions cluster-autoscaler/core/scale_down.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions cluster-autoscaler/core/scale_down_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cluster-autoscaler/core/scale_up.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
16 changes: 8 additions & 8 deletions cluster-autoscaler/core/scale_up_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions cluster-autoscaler/core/static_autoscaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cluster-autoscaler/core/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions cluster-autoscaler/core/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/estimator/binpacking_estimator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/estimator/binpacking_estimator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/expander/expander.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions cluster-autoscaler/expander/factory/expander_factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/expander/mostpods/mostpods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/expander/mostpods/mostpods_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/expander/random/random.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/expander/random/random_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/expander/waste/waste.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/expander/waste/waste_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading

0 comments on commit 55db148

Please sign in to comment.