From c88a07ce1a20ee1de8fc61f02960dae3407146fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Tue, 2 Aug 2016 15:12:39 +0300 Subject: [PATCH] Run goimports --- .../providers/aws/route53/stubs/route53api.go | 1 + .../pkg/federation-controller/service/cluster_helper.go | 3 ++- federation/registry/cluster/strategy_test.go | 3 ++- pkg/api/service/util_test.go | 3 ++- pkg/apiserver/validator.go | 3 ++- pkg/apiserver/validator_test.go | 3 ++- pkg/client/record/event.go | 3 ++- pkg/client/restclient/client_test.go | 1 + pkg/cloudprovider/providers/aws/aws.go | 3 ++- pkg/cloudprovider/providers/mesos/mesos.go | 4 +++- pkg/cloudprovider/providers/ovirt/ovirt.go | 1 + pkg/cloudprovider/providers/rackspace/rackspace.go | 5 +++-- pkg/cloudprovider/providers/vsphere/vsphere.go | 5 +++-- pkg/controller/endpoint/endpoints_controller.go | 1 + pkg/controller/node/cidr_set_test.go | 3 ++- pkg/controller/petset/identity_mappers_test.go | 3 ++- pkg/controller/petset/iterator_test.go | 3 ++- pkg/dns/treecache.go | 3 ++- pkg/kubectl/cmd/taint.go | 1 + pkg/proxy/iptables/proxier_test.go | 5 +++-- pkg/registry/componentstatus/rest.go | 3 ++- pkg/registry/componentstatus/rest_test.go | 7 ++++--- pkg/registry/podsecuritypolicy/strategy.go | 1 + .../podsecuritypolicy/capabilities/mustrunas_test.go | 3 ++- pkg/util/flowcontrol/backoff_test.go | 3 ++- pkg/util/keymutex/keymutex.go | 3 ++- pkg/volume/util.go | 9 +++++---- plugin/pkg/admission/initialresources/hawkular_test.go | 3 ++- .../pkg/admission/namespace/autoprovision/admission.go | 1 + plugin/pkg/admission/namespace/exists/admission.go | 1 + 30 files changed, 61 insertions(+), 30 deletions(-) diff --git a/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go b/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go index 30ce06260cc..2ec39801b08 100644 --- a/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go +++ b/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go @@ -19,6 +19,7 @@ package stubs import ( "fmt" + "github.com/aws/aws-sdk-go/service/route53" ) diff --git a/federation/pkg/federation-controller/service/cluster_helper.go b/federation/pkg/federation-controller/service/cluster_helper.go index 8fa8cae274f..275ba662d0b 100644 --- a/federation/pkg/federation-controller/service/cluster_helper.go +++ b/federation/pkg/federation-controller/service/cluster_helper.go @@ -31,9 +31,10 @@ import ( "k8s.io/kubernetes/pkg/util/workqueue" "k8s.io/kubernetes/pkg/watch" + "reflect" + "github.com/golang/glog" "k8s.io/kubernetes/federation/pkg/federation-controller/util" - "reflect" ) type clusterCache struct { diff --git a/federation/registry/cluster/strategy_test.go b/federation/registry/cluster/strategy_test.go index 43962e26389..20b3fe4dfc6 100644 --- a/federation/registry/cluster/strategy_test.go +++ b/federation/registry/cluster/strategy_test.go @@ -19,13 +19,14 @@ package cluster import ( "testing" + "reflect" + "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" - "reflect" ) func validNewCluster() *federation.Cluster { diff --git a/pkg/api/service/util_test.go b/pkg/api/service/util_test.go index 1c4c20c0048..c1e6c7fb4d4 100644 --- a/pkg/api/service/util_test.go +++ b/pkg/api/service/util_test.go @@ -19,9 +19,10 @@ package service import ( "testing" + "strings" + "k8s.io/kubernetes/pkg/api" netsets "k8s.io/kubernetes/pkg/util/net/sets" - "strings" ) func TestGetLoadBalancerSourceRanges(t *testing.T) { diff --git a/pkg/apiserver/validator.go b/pkg/apiserver/validator.go index 7e155013fa7..fb5c8e4592b 100644 --- a/pkg/apiserver/validator.go +++ b/pkg/apiserver/validator.go @@ -19,10 +19,11 @@ package apiserver import ( "net/http" + "time" + "k8s.io/kubernetes/pkg/probe" httpprober "k8s.io/kubernetes/pkg/probe/http" utilnet "k8s.io/kubernetes/pkg/util/net" - "time" ) const ( diff --git a/pkg/apiserver/validator_test.go b/pkg/apiserver/validator_test.go index d44d50885dc..7d7bc13ead4 100644 --- a/pkg/apiserver/validator_test.go +++ b/pkg/apiserver/validator_test.go @@ -21,10 +21,11 @@ import ( "fmt" "testing" - "k8s.io/kubernetes/pkg/probe" "net/http" "net/url" "time" + + "k8s.io/kubernetes/pkg/probe" ) type fakeHttpProber struct { diff --git a/pkg/client/record/event.go b/pkg/client/record/event.go index 9378f784b10..55873a73d94 100644 --- a/pkg/client/record/event.go +++ b/pkg/client/record/event.go @@ -30,8 +30,9 @@ import ( utilruntime "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/watch" - "github.com/golang/glog" "net/http" + + "github.com/golang/glog" ) const maxTriesPerEvent = 12 diff --git a/pkg/client/restclient/client_test.go b/pkg/client/restclient/client_test.go index 2d20ababff3..289f4ba093b 100644 --- a/pkg/client/restclient/client_test.go +++ b/pkg/client/restclient/client_test.go @@ -26,6 +26,7 @@ import ( "time" "fmt" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index e83ddd47593..42ceda85fe7 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -28,6 +28,8 @@ import ( "sync" "time" + "gopkg.in/gcfg.v1" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/credentials" @@ -39,7 +41,6 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/elb" "github.com/golang/glog" - "gopkg.in/gcfg.v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/service" diff --git a/pkg/cloudprovider/providers/mesos/mesos.go b/pkg/cloudprovider/providers/mesos/mesos.go index 1ca1dcf3659..dd446e6b19c 100644 --- a/pkg/cloudprovider/providers/mesos/mesos.go +++ b/pkg/cloudprovider/providers/mesos/mesos.go @@ -23,9 +23,11 @@ import ( "net" "regexp" + "golang.org/x/net/context" + log "github.com/golang/glog" "github.com/mesos/mesos-go/detector" - "golang.org/x/net/context" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/cloudprovider" ) diff --git a/pkg/cloudprovider/providers/ovirt/ovirt.go b/pkg/cloudprovider/providers/ovirt/ovirt.go index 3fb29893f5c..24b9fc091d3 100644 --- a/pkg/cloudprovider/providers/ovirt/ovirt.go +++ b/pkg/cloudprovider/providers/ovirt/ovirt.go @@ -30,6 +30,7 @@ import ( "strings" "gopkg.in/gcfg.v1" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/cloudprovider" ) diff --git a/pkg/cloudprovider/providers/rackspace/rackspace.go b/pkg/cloudprovider/providers/rackspace/rackspace.go index d0360966245..6b3a27d07fe 100644 --- a/pkg/cloudprovider/providers/rackspace/rackspace.go +++ b/pkg/cloudprovider/providers/rackspace/rackspace.go @@ -28,6 +28,9 @@ import ( "strings" "time" + "gopkg.in/gcfg.v1" + + "github.com/golang/glog" "github.com/rackspace/gophercloud" osvolumeattach "github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach" osservers "github.com/rackspace/gophercloud/openstack/compute/v2/servers" @@ -36,9 +39,7 @@ import ( "github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes" "github.com/rackspace/gophercloud/rackspace/compute/v2/servers" "github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach" - "gopkg.in/gcfg.v1" - "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/cloudprovider" ) diff --git a/pkg/cloudprovider/providers/vsphere/vsphere.go b/pkg/cloudprovider/providers/vsphere/vsphere.go index 788ff787050..3327c2aea55 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere.go +++ b/pkg/cloudprovider/providers/vsphere/vsphere.go @@ -25,6 +25,9 @@ import ( "path" "strings" + "gopkg.in/gcfg.v1" + + "github.com/golang/glog" "github.com/vmware/govmomi" "github.com/vmware/govmomi/find" "github.com/vmware/govmomi/object" @@ -32,9 +35,7 @@ import ( "github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/types" "golang.org/x/net/context" - "gopkg.in/gcfg.v1" - "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/util/runtime" diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index ce557bda81f..0971d7f190c 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -24,6 +24,7 @@ import ( "time" "encoding/json" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/endpoints" diff --git a/pkg/controller/node/cidr_set_test.go b/pkg/controller/node/cidr_set_test.go index f3e7165f052..67d59a76d0b 100644 --- a/pkg/controller/node/cidr_set_test.go +++ b/pkg/controller/node/cidr_set_test.go @@ -17,11 +17,12 @@ limitations under the License. package node import ( - "github.com/golang/glog" "math/big" "net" "reflect" "testing" + + "github.com/golang/glog" ) func TestCIDRSetFullyAllocated(t *testing.T) { diff --git a/pkg/controller/petset/identity_mappers_test.go b/pkg/controller/petset/identity_mappers_test.go index 6f5e822e83f..9ae65ace976 100644 --- a/pkg/controller/petset/identity_mappers_test.go +++ b/pkg/controller/petset/identity_mappers_test.go @@ -21,9 +21,10 @@ import ( "reflect" "strings" + "testing" + "k8s.io/kubernetes/pkg/api" api_pod "k8s.io/kubernetes/pkg/api/pod" - "testing" ) func TestPetIDName(t *testing.T) { diff --git a/pkg/controller/petset/iterator_test.go b/pkg/controller/petset/iterator_test.go index dafe1cd3d76..b65d10a2561 100644 --- a/pkg/controller/petset/iterator_test.go +++ b/pkg/controller/petset/iterator_test.go @@ -19,9 +19,10 @@ package petset import ( "fmt" + "testing" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/util/sets" - "testing" ) func TestPetQueueCreates(t *testing.T) { diff --git a/pkg/dns/treecache.go b/pkg/dns/treecache.go index 0c8f23c6ddb..34a07d53ccc 100644 --- a/pkg/dns/treecache.go +++ b/pkg/dns/treecache.go @@ -19,8 +19,9 @@ package dns import ( "bytes" "encoding/json" - skymsg "github.com/skynetservices/skydns/msg" "strings" + + skymsg "github.com/skynetservices/skydns/msg" ) type TreeCache struct { diff --git a/pkg/kubectl/cmd/taint.go b/pkg/kubectl/cmd/taint.go index 796bfb65c35..7a7b6bda2cb 100644 --- a/pkg/kubectl/cmd/taint.go +++ b/pkg/kubectl/cmd/taint.go @@ -22,6 +22,7 @@ import ( "strings" "encoding/json" + "github.com/golang/glog" "github.com/renstrom/dedent" "github.com/spf13/cobra" diff --git a/pkg/proxy/iptables/proxier_test.go b/pkg/proxy/iptables/proxier_test.go index 4ef5126098a..c9c1fb36d3f 100644 --- a/pkg/proxy/iptables/proxier_test.go +++ b/pkg/proxy/iptables/proxier_test.go @@ -20,13 +20,14 @@ import ( "testing" "fmt" + "net" + "strings" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/exec" utiliptables "k8s.io/kubernetes/pkg/util/iptables" - "net" - "strings" ) func checkAllLines(t *testing.T, table utiliptables.Table, save []byte, expectedLines map[utiliptables.Chain]string) { diff --git a/pkg/registry/componentstatus/rest.go b/pkg/registry/componentstatus/rest.go index 3de63e0e9fd..984ba879876 100644 --- a/pkg/registry/componentstatus/rest.go +++ b/pkg/registry/componentstatus/rest.go @@ -19,12 +19,13 @@ package componentstatus import ( "fmt" + "sync" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/probe" httpprober "k8s.io/kubernetes/pkg/probe/http" "k8s.io/kubernetes/pkg/runtime" - "sync" ) type REST struct { diff --git a/pkg/registry/componentstatus/rest_test.go b/pkg/registry/componentstatus/rest_test.go index cf786dc4880..0d776ecbae9 100644 --- a/pkg/registry/componentstatus/rest_test.go +++ b/pkg/registry/componentstatus/rest_test.go @@ -22,13 +22,14 @@ import ( "strings" "testing" + "net/http" + "net/url" + "time" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/probe" "k8s.io/kubernetes/pkg/util/diff" - "net/http" - "net/url" - "time" ) type fakeHttpProber struct { diff --git a/pkg/registry/podsecuritypolicy/strategy.go b/pkg/registry/podsecuritypolicy/strategy.go index 9d04bdd9335..a998bbfaecb 100644 --- a/pkg/registry/podsecuritypolicy/strategy.go +++ b/pkg/registry/podsecuritypolicy/strategy.go @@ -18,6 +18,7 @@ package podsecuritypolicy import ( "fmt" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" diff --git a/pkg/security/podsecuritypolicy/capabilities/mustrunas_test.go b/pkg/security/podsecuritypolicy/capabilities/mustrunas_test.go index b8cbafecaf1..8afb8ac9be6 100644 --- a/pkg/security/podsecuritypolicy/capabilities/mustrunas_test.go +++ b/pkg/security/podsecuritypolicy/capabilities/mustrunas_test.go @@ -17,9 +17,10 @@ limitations under the License. package capabilities import ( - "k8s.io/kubernetes/pkg/api" "reflect" "testing" + + "k8s.io/kubernetes/pkg/api" ) func TestGenerateAdds(t *testing.T) { diff --git a/pkg/util/flowcontrol/backoff_test.go b/pkg/util/flowcontrol/backoff_test.go index a112f5dd636..df663221d82 100644 --- a/pkg/util/flowcontrol/backoff_test.go +++ b/pkg/util/flowcontrol/backoff_test.go @@ -17,9 +17,10 @@ limitations under the License. package flowcontrol import ( - "k8s.io/kubernetes/pkg/util/clock" "testing" "time" + + "k8s.io/kubernetes/pkg/util/clock" ) func TestSlowBackoff(t *testing.T) { diff --git a/pkg/util/keymutex/keymutex.go b/pkg/util/keymutex/keymutex.go index fcffa99bfcc..6955d2bb70b 100644 --- a/pkg/util/keymutex/keymutex.go +++ b/pkg/util/keymutex/keymutex.go @@ -18,8 +18,9 @@ package keymutex import ( "fmt" - "github.com/golang/glog" "sync" + + "github.com/golang/glog" ) // KeyMutex is a thread-safe interface for acquiring locks on arbitrary strings. diff --git a/pkg/volume/util.go b/pkg/volume/util.go index b36632c9f52..085692fe3e8 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -27,14 +27,15 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" - "github.com/golang/glog" "hash/fnv" - "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/util/sets" "math/rand" "strconv" "strings" + + "github.com/golang/glog" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/util/sets" ) // RecycleVolumeByWatchingPodUntilCompletion is intended for use with volume diff --git a/plugin/pkg/admission/initialresources/hawkular_test.go b/plugin/pkg/admission/initialresources/hawkular_test.go index 5c5cb8d9b22..53c25c326a9 100644 --- a/plugin/pkg/admission/initialresources/hawkular_test.go +++ b/plugin/pkg/admission/initialresources/hawkular_test.go @@ -18,7 +18,6 @@ package initialresources import ( "fmt" - "k8s.io/kubernetes/pkg/api" "net/http" "net/http/httptest" "net/url" @@ -26,6 +25,8 @@ import ( "testing" "time" + "k8s.io/kubernetes/pkg/api" + assert "github.com/stretchr/testify/require" ) diff --git a/plugin/pkg/admission/namespace/autoprovision/admission.go b/plugin/pkg/admission/namespace/autoprovision/admission.go index 3f248ef5982..627a68f3088 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission.go @@ -22,6 +22,7 @@ import ( clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "fmt" + "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" diff --git a/plugin/pkg/admission/namespace/exists/admission.go b/plugin/pkg/admission/namespace/exists/admission.go index ab031ee607b..f436cdaa443 100644 --- a/plugin/pkg/admission/namespace/exists/admission.go +++ b/plugin/pkg/admission/namespace/exists/admission.go @@ -22,6 +22,7 @@ import ( clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "fmt" + "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors"