From 17defc7383914c1f52d30ab4a46e0992cbfc2bae Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Wed, 5 Aug 2015 15:05:17 -0700 Subject: [PATCH] run gofmt on everything we touched --- cluster/addons/dns/kube2sky/kube2sky.go | 6 ++--- cluster/addons/dns/kube2sky/kube2sky_test.go | 4 +-- .../elasticsearch_logging_discovery.go | 2 +- cluster/addons/kube-ui/image/kube-ui.go | 2 +- cmd/gendocs/gen_kubectl_docs.go | 2 +- cmd/genman/gen_kubectl_man.go | 6 ++--- cmd/integration/integration.go | 2 +- cmd/kube-apiserver/app/server.go | 2 +- cmd/kubelet/app/server.go | 2 +- contrib/mesos/cmd/k8sm-executor/main.go | 2 +- contrib/mesos/cmd/k8sm-scheduler/main.go | 2 +- contrib/mesos/pkg/election/etcd_master.go | 4 +-- .../mesos/pkg/election/etcd_master_test.go | 2 +- contrib/mesos/pkg/executor/executor.go | 12 ++++----- contrib/mesos/pkg/executor/mock_test.go | 2 +- contrib/mesos/pkg/executor/service/service.go | 4 +-- contrib/mesos/pkg/offers/offers.go | 4 +-- contrib/mesos/pkg/offers/offers_test.go | 2 +- contrib/mesos/pkg/proc/proc.go | 2 +- contrib/mesos/pkg/proc/proc_test.go | 2 +- contrib/mesos/pkg/runtime/metrics.go | 2 +- contrib/mesos/pkg/scheduler/ha/election.go | 2 +- contrib/mesos/pkg/scheduler/ha/ha.go | 4 +-- contrib/mesos/pkg/scheduler/mock_test.go | 4 +-- contrib/mesos/pkg/scheduler/plugin.go | 6 ++--- contrib/mesos/pkg/scheduler/plugin_test.go | 12 ++++----- .../mesos/pkg/scheduler/podtask/pod_task.go | 4 +-- .../pkg/scheduler/podtask/pod_task_test.go | 4 +-- .../pkg/scheduler/podtask/port_mapping.go | 4 +-- .../scheduler/podtask/port_mapping_test.go | 2 +- .../mesos/pkg/scheduler/podtask/registry.go | 4 +-- .../pkg/scheduler/podtask/registry_test.go | 4 +-- contrib/mesos/pkg/scheduler/scheduler.go | 8 +++--- contrib/mesos/pkg/scheduler/scheduler_test.go | 6 ++--- .../mesos/pkg/scheduler/service/service.go | 26 +++++++++---------- .../service_loadbalancer.go | 4 +-- .../elasticsearch/elasticsearch_discovery.go | 2 +- examples/examples_test.go | 2 +- examples/https-nginx/make_secret.go | 2 +- pkg/admission/plugins.go | 2 +- pkg/api/context.go | 2 +- pkg/api/endpoints/util_test.go | 2 +- pkg/api/rest/resttest/resttest.go | 2 +- pkg/api/serialization_test.go | 2 +- pkg/api/testing/fuzzer.go | 2 +- pkg/api/validation/schema.go | 4 +-- pkg/apiserver/handlers.go | 2 +- pkg/apiserver/proxy.go | 2 +- pkg/apiserver/proxy_test.go | 2 +- pkg/apiserver/watch_test.go | 2 +- pkg/auth/handlers/handlers.go | 2 +- pkg/client/cache/expiration_cache.go | 2 +- pkg/client/cache/listers.go | 2 +- pkg/client/cache/poller.go | 2 +- pkg/client/cache/reflector.go | 2 +- pkg/client/helper.go | 2 +- pkg/client/portforward/portforward.go | 2 +- pkg/client/record/events_cache.go | 2 +- pkg/client/remotecommand/remotecommand.go | 2 +- pkg/client/request.go | 2 +- pkg/cloudprovider/aws/aws_routes.go | 2 +- pkg/cloudprovider/aws/aws_test.go | 4 +-- pkg/cloudprovider/mesos/client.go | 4 +-- pkg/cloudprovider/mesos/mesos.go | 4 +-- pkg/cloudprovider/openstack/openstack.go | 2 +- pkg/cloudprovider/rackspace/rackspace.go | 2 +- pkg/controller/controller_utils.go | 2 +- pkg/controller/node/nodecontroller.go | 2 +- .../replication/replication_controller.go | 2 +- .../replication_controller_utils.go | 2 +- .../resource_quota_controller.go | 2 +- pkg/controller/route/routecontroller.go | 2 +- pkg/controller/service/servicecontroller.go | 2 +- pkg/controller/serviceaccount/jwt_test.go | 2 +- .../serviceaccounts_controller.go | 2 +- .../serviceaccount/tokens_controller.go | 2 +- pkg/credentialprovider/gcp/jwt.go | 2 +- pkg/credentialprovider/gcp/metadata.go | 2 +- pkg/kubectl/bash_comp_utils.go | 2 +- pkg/kubectl/cmd/annotation.go | 2 +- pkg/kubectl/cmd/attach.go | 6 ++--- pkg/kubectl/cmd/cmd.go | 2 +- pkg/kubectl/cmd/exec.go | 6 ++--- pkg/kubectl/cmd/label.go | 2 +- pkg/kubectl/cmd/log.go | 2 +- pkg/kubectl/cmd/namespace.go | 2 +- pkg/kubectl/cmd/portforward.go | 4 +-- pkg/kubectl/cmd/proxy.go | 4 +-- pkg/kubectl/cmd/replace.go | 2 +- pkg/kubectl/cmd/rollingupdate.go | 2 +- pkg/kubectl/cmd/run.go | 2 +- pkg/kubectl/cmd/stop.go | 2 +- pkg/kubectl/cmd/util/helpers.go | 2 +- pkg/kubectl/describe.go | 2 +- pkg/kubectl/generate.go | 2 +- pkg/kubectl/proxy_server.go | 2 +- pkg/kubectl/resource_printer.go | 4 +-- pkg/kubelet/cadvisor/cadvisor_linux.go | 2 +- pkg/kubelet/config/config.go | 2 +- pkg/kubelet/container_bridge.go | 2 +- pkg/kubelet/container_gc.go | 4 +-- pkg/kubelet/container_gc_test.go | 2 +- pkg/kubelet/container_manager_linux.go | 8 +++--- pkg/kubelet/disk_manager.go | 2 +- pkg/kubelet/disk_manager_test.go | 2 +- pkg/kubelet/dockertools/convert.go | 2 +- pkg/kubelet/dockertools/convert_test.go | 2 +- pkg/kubelet/dockertools/docker.go | 8 +++--- pkg/kubelet/dockertools/docker_test.go | 4 +-- pkg/kubelet/dockertools/exec.go | 2 +- .../dockertools/instrumented_docker.go | 2 +- pkg/kubelet/dockertools/manager.go | 6 ++--- pkg/kubelet/dockertools/manager_test.go | 2 +- pkg/kubelet/image_manager.go | 4 +-- pkg/kubelet/image_manager_test.go | 8 +++--- pkg/kubelet/kubelet.go | 2 +- pkg/kubelet/kubelet_test.go | 4 +-- pkg/kubelet/lifecycle/handlers.go | 2 +- pkg/kubelet/metrics/metrics.go | 2 +- pkg/kubelet/mirror_client.go | 2 +- pkg/kubelet/network/exec/exec.go | 2 +- pkg/kubelet/network/plugins.go | 2 +- pkg/kubelet/oom_watcher.go | 6 ++--- pkg/kubelet/pod_manager.go | 2 +- pkg/kubelet/pod_workers.go | 2 +- pkg/kubelet/pod_workers_test.go | 2 +- pkg/kubelet/rkt/pod_info.go | 2 +- pkg/kubelet/rkt/rkt.go | 14 +++++----- pkg/kubelet/runonce.go | 2 +- pkg/kubelet/runonce_test.go | 4 +-- pkg/kubelet/runtime_hooks.go | 2 +- pkg/kubelet/server.go | 6 ++--- pkg/kubelet/server_test.go | 2 +- pkg/kubelet/status_manager.go | 2 +- pkg/kubelet/util.go | 2 +- pkg/kubelet/volumes.go | 4 +-- pkg/master/master.go | 4 +-- pkg/proxy/config/config.go | 2 +- pkg/proxy/proxier.go | 2 +- pkg/proxy/proxysocket.go | 2 +- pkg/proxy/roundrobin.go | 2 +- pkg/registry/controller/etcd/etcd_test.go | 2 +- pkg/registry/generic/rest/proxy.go | 2 +- pkg/registry/service/rest.go | 2 +- pkg/storage/etcd/etcd_helper.go | 2 +- pkg/storage/etcd/etcd_helper_test.go | 4 +-- pkg/storage/etcd/etcd_watcher_test.go | 2 +- pkg/util/httpstream/spdy/connection.go | 2 +- pkg/util/httpstream/spdy/upgrade.go | 2 +- pkg/util/iptables/iptables.go | 2 +- pkg/util/mount/nsenter_mount.go | 2 +- pkg/util/node/node.go | 2 +- pkg/util/uuid.go | 2 +- pkg/version/verflag/verflag.go | 2 +- pkg/volume/aws_ebs/aws_ebs.go | 2 +- pkg/volume/aws_ebs/aws_util.go | 2 +- pkg/volume/empty_dir/empty_dir.go | 2 +- pkg/volume/empty_dir/empty_dir_linux.go | 2 +- pkg/volume/gce_pd/gce_pd.go | 2 +- pkg/volume/gce_pd/gce_util.go | 2 +- pkg/volume/glusterfs/glusterfs.go | 2 +- pkg/volume/iscsi/disk_manager.go | 2 +- pkg/volume/iscsi/iscsi.go | 2 +- pkg/volume/iscsi/iscsi_util.go | 2 +- .../persistent_claim/persistent_claim.go | 2 +- pkg/volume/plugins.go | 2 +- pkg/volume/rbd/disk_manager.go | 2 +- pkg/volume/rbd/rbd.go | 2 +- pkg/volume/rbd/rbd_util.go | 2 +- pkg/volume/secret/secret.go | 2 +- .../persistent_volume_recycler.go | 2 +- pkg/watch/iowatcher.go | 2 +- .../algorithm/priorities/priorities.go | 2 +- .../priorities/selector_spreading.go | 2 +- plugin/pkg/scheduler/generic_scheduler.go | 2 +- test/e2e/addon_update.go | 2 +- test/e2e/e2e_test.go | 8 +++--- test/e2e/kubelet_stats.go | 2 +- test/e2e/monitoring.go | 2 +- test/e2e/pd.go | 4 +-- test/e2e/persistent_volumes.go | 4 +-- test/e2e/resize_nodes.go | 2 +- test/e2e/service.go | 4 +-- test/integration/framework/etcd_utils.go | 4 +-- test/integration/framework/master_utils.go | 2 +- test/integration/master_benchmark_test.go | 2 +- test/soak/cauldron/cauldron.go | 2 +- test/soak/serve_hostnames/serve_hostnames.go | 2 +- 188 files changed, 280 insertions(+), 280 deletions(-) diff --git a/cluster/addons/dns/kube2sky/kube2sky.go b/cluster/addons/dns/kube2sky/kube2sky.go index 6b9354c2dc0..e8a24ec7fb9 100644 --- a/cluster/addons/dns/kube2sky/kube2sky.go +++ b/cluster/addons/dns/kube2sky/kube2sky.go @@ -31,6 +31,9 @@ import ( "sync" "time" + etcd "github.com/coreos/go-etcd/etcd" + "github.com/golang/glog" + skymsg "github.com/skynetservices/skydns/msg" kapi "k8s.io/kubernetes/pkg/api" kclient "k8s.io/kubernetes/pkg/client" kcache "k8s.io/kubernetes/pkg/client/cache" @@ -40,9 +43,6 @@ import ( etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/wait" - etcd "github.com/coreos/go-etcd/etcd" - "github.com/golang/glog" - skymsg "github.com/skynetservices/skydns/msg" ) var ( diff --git a/cluster/addons/dns/kube2sky/kube2sky_test.go b/cluster/addons/dns/kube2sky/kube2sky_test.go index f276d678b98..a6e154973f9 100644 --- a/cluster/addons/dns/kube2sky/kube2sky_test.go +++ b/cluster/addons/dns/kube2sky/kube2sky_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - kapi "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" "github.com/coreos/go-etcd/etcd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + kapi "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" ) type fakeEtcdClient struct { diff --git a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go index a05450bd787..0a7141e9a75 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go +++ b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go @@ -22,9 +22,9 @@ import ( "strings" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" - "github.com/golang/glog" ) func flattenSubsets(subsets []api.EndpointSubset) []string { diff --git a/cluster/addons/kube-ui/image/kube-ui.go b/cluster/addons/kube-ui/image/kube-ui.go index 73175cc415c..16b95698b00 100644 --- a/cluster/addons/kube-ui/image/kube-ui.go +++ b/cluster/addons/kube-ui/image/kube-ui.go @@ -23,8 +23,8 @@ import ( "mime" "net/http" - "k8s.io/kubernetes/pkg/ui/data/dashboard" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/ui/data/dashboard" assetfs "github.com/elazarl/go-bindata-assetfs" ) diff --git a/cmd/gendocs/gen_kubectl_docs.go b/cmd/gendocs/gen_kubectl_docs.go index 47416124dfa..1c9074e022f 100644 --- a/cmd/gendocs/gen_kubectl_docs.go +++ b/cmd/gendocs/gen_kubectl_docs.go @@ -21,10 +21,10 @@ import ( "io/ioutil" "os" + "github.com/spf13/cobra" "k8s.io/kubernetes/cmd/genutils" "k8s.io/kubernetes/pkg/kubectl/cmd" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "github.com/spf13/cobra" ) func main() { diff --git a/cmd/genman/gen_kubectl_man.go b/cmd/genman/gen_kubectl_man.go index 2a9182d3a43..a1e89af74a4 100644 --- a/cmd/genman/gen_kubectl_man.go +++ b/cmd/genman/gen_kubectl_man.go @@ -23,12 +23,12 @@ import ( "os" "strings" - "k8s.io/kubernetes/cmd/genutils" - "k8s.io/kubernetes/pkg/kubectl/cmd" - cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" mangen "github.com/cpuguy83/go-md2man/md2man" "github.com/spf13/cobra" "github.com/spf13/pflag" + "k8s.io/kubernetes/cmd/genutils" + "k8s.io/kubernetes/pkg/kubectl/cmd" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) func main() { diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 7f9d5d3e005..6f3246666d6 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -33,6 +33,7 @@ import ( "sync" "time" + docker "github.com/fsouza/go-dockerclient" kubeletapp "k8s.io/kubernetes/cmd/kubelet/app" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" @@ -61,7 +62,6 @@ import ( _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" "k8s.io/kubernetes/plugin/pkg/scheduler/factory" "k8s.io/kubernetes/test/e2e" - docker "github.com/fsouza/go-dockerclient" "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index ee275cd81b6..2c1146cd0c8 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -30,6 +30,7 @@ import ( "strings" "time" + systemd "github.com/coreos/go-systemd/daemon" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" @@ -45,7 +46,6 @@ import ( "k8s.io/kubernetes/pkg/tools" "k8s.io/kubernetes/pkg/util" forked "k8s.io/kubernetes/third_party/forked/coreos/go-etcd/etcd" - systemd "github.com/coreos/go-systemd/daemon" "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 05f6fef3cdc..8cbdcfba15c 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -54,9 +54,9 @@ import ( nodeutil "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/pkg/cloudprovider" "github.com/golang/glog" "github.com/spf13/pflag" + "k8s.io/kubernetes/pkg/cloudprovider" ) const defaultRootDir = "/var/lib/kubelet" diff --git a/contrib/mesos/cmd/k8sm-executor/main.go b/contrib/mesos/cmd/k8sm-executor/main.go index d393a4b03be..82d6366f2fc 100644 --- a/contrib/mesos/cmd/k8sm-executor/main.go +++ b/contrib/mesos/cmd/k8sm-executor/main.go @@ -21,11 +21,11 @@ import ( "os" "runtime" + "github.com/spf13/pflag" "k8s.io/kubernetes/contrib/mesos/pkg/executor/service" "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/version/verflag" - "github.com/spf13/pflag" ) func main() { diff --git a/contrib/mesos/cmd/k8sm-scheduler/main.go b/contrib/mesos/cmd/k8sm-scheduler/main.go index 4b22962ed8b..1bba89504c7 100644 --- a/contrib/mesos/cmd/k8sm-scheduler/main.go +++ b/contrib/mesos/cmd/k8sm-scheduler/main.go @@ -21,11 +21,11 @@ import ( "os" "runtime" + "github.com/spf13/pflag" "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/service" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/version/verflag" - "github.com/spf13/pflag" ) func main() { diff --git a/contrib/mesos/pkg/election/etcd_master.go b/contrib/mesos/pkg/election/etcd_master.go index 2a0e0a0e98b..3e5e7fc4360 100644 --- a/contrib/mesos/pkg/election/etcd_master.go +++ b/contrib/mesos/pkg/election/etcd_master.go @@ -20,12 +20,12 @@ import ( "fmt" "time" + "github.com/coreos/go-etcd/etcd" + "github.com/golang/glog" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" "k8s.io/kubernetes/pkg/tools" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" - "github.com/coreos/go-etcd/etcd" - "github.com/golang/glog" ) // Master is used to announce the current elected master. diff --git a/contrib/mesos/pkg/election/etcd_master_test.go b/contrib/mesos/pkg/election/etcd_master_test.go index 03c1296a526..5378d2a7725 100644 --- a/contrib/mesos/pkg/election/etcd_master_test.go +++ b/contrib/mesos/pkg/election/etcd_master_test.go @@ -19,9 +19,9 @@ package election import ( "testing" + "github.com/coreos/go-etcd/etcd" "k8s.io/kubernetes/pkg/tools" "k8s.io/kubernetes/pkg/watch" - "github.com/coreos/go-etcd/etcd" ) func TestEtcdMasterOther(t *testing.T) { diff --git a/contrib/mesos/pkg/executor/executor.go b/contrib/mesos/pkg/executor/executor.go index 6360aec1e07..c22862b53fe 100644 --- a/contrib/mesos/pkg/executor/executor.go +++ b/contrib/mesos/pkg/executor/executor.go @@ -25,6 +25,12 @@ import ( "sync/atomic" "time" + "github.com/fsouza/go-dockerclient" + "github.com/gogo/protobuf/proto" + log "github.com/golang/glog" + bindings "github.com/mesos/mesos-go/executor" + mesos "github.com/mesos/mesos-go/mesosproto" + mutil "github.com/mesos/mesos-go/mesosutil" "k8s.io/kubernetes/contrib/mesos/pkg/archive" "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" @@ -35,12 +41,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" - "github.com/fsouza/go-dockerclient" - "github.com/gogo/protobuf/proto" - log "github.com/golang/glog" - bindings "github.com/mesos/mesos-go/executor" - mesos "github.com/mesos/mesos-go/mesosproto" - mutil "github.com/mesos/mesos-go/mesosutil" ) const ( diff --git a/contrib/mesos/pkg/executor/mock_test.go b/contrib/mesos/pkg/executor/mock_test.go index 3ea17cbe6e3..be4951eab58 100644 --- a/contrib/mesos/pkg/executor/mock_test.go +++ b/contrib/mesos/pkg/executor/mock_test.go @@ -19,10 +19,10 @@ package executor import ( "testing" - "k8s.io/kubernetes/pkg/kubelet/dockertools" "github.com/mesos/mesos-go/mesosproto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "k8s.io/kubernetes/pkg/kubelet/dockertools" ) type MockExecutorDriver struct { diff --git a/contrib/mesos/pkg/executor/service/service.go b/contrib/mesos/pkg/executor/service/service.go index 99b2425e111..8e42367c8c7 100644 --- a/contrib/mesos/pkg/executor/service/service.go +++ b/contrib/mesos/pkg/executor/service/service.go @@ -30,6 +30,8 @@ import ( "sync" "time" + log "github.com/golang/glog" + bindings "github.com/mesos/mesos-go/executor" "k8s.io/kubernetes/cmd/kubelet/app" "k8s.io/kubernetes/contrib/mesos/pkg/executor" "k8s.io/kubernetes/contrib/mesos/pkg/executor/config" @@ -45,8 +47,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/mount" - log "github.com/golang/glog" - bindings "github.com/mesos/mesos-go/executor" "github.com/spf13/pflag" ) diff --git a/contrib/mesos/pkg/offers/offers.go b/contrib/mesos/pkg/offers/offers.go index 71ed07cc875..2c915748059 100644 --- a/contrib/mesos/pkg/offers/offers.go +++ b/contrib/mesos/pkg/offers/offers.go @@ -23,14 +23,14 @@ import ( "sync/atomic" "time" + log "github.com/golang/glog" + mesos "github.com/mesos/mesos-go/mesosproto" "k8s.io/kubernetes/contrib/mesos/pkg/offers/metrics" "k8s.io/kubernetes/contrib/mesos/pkg/proc" "k8s.io/kubernetes/contrib/mesos/pkg/queue" "k8s.io/kubernetes/contrib/mesos/pkg/runtime" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/util" - log "github.com/golang/glog" - mesos "github.com/mesos/mesos-go/mesosproto" ) const ( diff --git a/contrib/mesos/pkg/offers/offers_test.go b/contrib/mesos/pkg/offers/offers_test.go index a7193beb21e..e82712bed63 100644 --- a/contrib/mesos/pkg/offers/offers_test.go +++ b/contrib/mesos/pkg/offers/offers_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "k8s.io/kubernetes/contrib/mesos/pkg/proc" mesos "github.com/mesos/mesos-go/mesosproto" util "github.com/mesos/mesos-go/mesosutil" + "k8s.io/kubernetes/contrib/mesos/pkg/proc" ) func TestExpiredOffer(t *testing.T) { diff --git a/contrib/mesos/pkg/proc/proc.go b/contrib/mesos/pkg/proc/proc.go index 619d49de264..8a47948e6ca 100644 --- a/contrib/mesos/pkg/proc/proc.go +++ b/contrib/mesos/pkg/proc/proc.go @@ -22,8 +22,8 @@ import ( "sync/atomic" "time" - "k8s.io/kubernetes/contrib/mesos/pkg/runtime" log "github.com/golang/glog" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" ) const ( diff --git a/contrib/mesos/pkg/proc/proc_test.go b/contrib/mesos/pkg/proc/proc_test.go index 5d450c31121..33d536fe162 100644 --- a/contrib/mesos/pkg/proc/proc_test.go +++ b/contrib/mesos/pkg/proc/proc_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "k8s.io/kubernetes/contrib/mesos/pkg/runtime" log "github.com/golang/glog" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" ) // logs a testing.Fatalf if the elapsed time d passes before signal chan done is closed diff --git a/contrib/mesos/pkg/runtime/metrics.go b/contrib/mesos/pkg/runtime/metrics.go index 8a57fb7f75b..be5232dba2e 100644 --- a/contrib/mesos/pkg/runtime/metrics.go +++ b/contrib/mesos/pkg/runtime/metrics.go @@ -19,8 +19,8 @@ package runtime import ( "sync" - "k8s.io/kubernetes/pkg/util" "github.com/prometheus/client_golang/prometheus" + "k8s.io/kubernetes/pkg/util" ) const ( diff --git a/contrib/mesos/pkg/scheduler/ha/election.go b/contrib/mesos/pkg/scheduler/ha/election.go index 0ef5cf314d4..b2b8be7a5ac 100644 --- a/contrib/mesos/pkg/scheduler/ha/election.go +++ b/contrib/mesos/pkg/scheduler/ha/election.go @@ -17,8 +17,8 @@ limitations under the License. package ha import ( - "k8s.io/kubernetes/contrib/mesos/pkg/election" log "github.com/golang/glog" + "k8s.io/kubernetes/contrib/mesos/pkg/election" ) type roleType int diff --git a/contrib/mesos/pkg/scheduler/ha/ha.go b/contrib/mesos/pkg/scheduler/ha/ha.go index 0fe4045a265..6c745067ffe 100644 --- a/contrib/mesos/pkg/scheduler/ha/ha.go +++ b/contrib/mesos/pkg/scheduler/ha/ha.go @@ -20,11 +20,11 @@ import ( "fmt" "sync/atomic" - "k8s.io/kubernetes/contrib/mesos/pkg/proc" - "k8s.io/kubernetes/contrib/mesos/pkg/runtime" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" bindings "github.com/mesos/mesos-go/scheduler" + "k8s.io/kubernetes/contrib/mesos/pkg/proc" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" ) type DriverFactory func() (bindings.SchedulerDriver, error) diff --git a/contrib/mesos/pkg/scheduler/mock_test.go b/contrib/mesos/pkg/scheduler/mock_test.go index ba3e214d7c1..e53024ec2cc 100644 --- a/contrib/mesos/pkg/scheduler/mock_test.go +++ b/contrib/mesos/pkg/scheduler/mock_test.go @@ -20,11 +20,11 @@ import ( "sync" "testing" + mesos "github.com/mesos/mesos-go/mesosproto" + "github.com/stretchr/testify/mock" "k8s.io/kubernetes/contrib/mesos/pkg/offers" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/pkg/api" - mesos "github.com/mesos/mesos-go/mesosproto" - "github.com/stretchr/testify/mock" ) // implements SchedulerInterface diff --git a/contrib/mesos/pkg/scheduler/plugin.go b/contrib/mesos/pkg/scheduler/plugin.go index c50e44956ad..6a6bd1e2e1d 100644 --- a/contrib/mesos/pkg/scheduler/plugin.go +++ b/contrib/mesos/pkg/scheduler/plugin.go @@ -24,6 +24,9 @@ import ( "sync" "time" + log "github.com/golang/glog" + mesos "github.com/mesos/mesos-go/mesosproto" + mutil "github.com/mesos/mesos-go/mesosutil" "k8s.io/kubernetes/contrib/mesos/pkg/backoff" "k8s.io/kubernetes/contrib/mesos/pkg/offers" "k8s.io/kubernetes/contrib/mesos/pkg/queue" @@ -40,9 +43,6 @@ import ( "k8s.io/kubernetes/pkg/util" plugin "k8s.io/kubernetes/plugin/pkg/scheduler" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - log "github.com/golang/glog" - mesos "github.com/mesos/mesos-go/mesosproto" - mutil "github.com/mesos/mesos-go/mesosutil" ) const ( diff --git a/contrib/mesos/pkg/scheduler/plugin_test.go b/contrib/mesos/pkg/scheduler/plugin_test.go index 346622100f8..69df27807ef 100644 --- a/contrib/mesos/pkg/scheduler/plugin_test.go +++ b/contrib/mesos/pkg/scheduler/plugin_test.go @@ -32,6 +32,12 @@ import ( kutil "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" + log "github.com/golang/glog" + mesos "github.com/mesos/mesos-go/mesosproto" + util "github.com/mesos/mesos-go/mesosutil" + bindings "github.com/mesos/mesos-go/scheduler" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" assertext "k8s.io/kubernetes/contrib/mesos/pkg/assert" "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" "k8s.io/kubernetes/contrib/mesos/pkg/queue" @@ -40,12 +46,6 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" - log "github.com/golang/glog" - mesos "github.com/mesos/mesos-go/mesosproto" - util "github.com/mesos/mesos-go/mesosutil" - bindings "github.com/mesos/mesos-go/scheduler" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" ) // A apiserver mock which partially mocks the pods API diff --git a/contrib/mesos/pkg/scheduler/podtask/pod_task.go b/contrib/mesos/pkg/scheduler/podtask/pod_task.go index 89231b9f378..6fbdf082efb 100644 --- a/contrib/mesos/pkg/scheduler/podtask/pod_task.go +++ b/contrib/mesos/pkg/scheduler/podtask/pod_task.go @@ -21,13 +21,13 @@ import ( "strings" "time" + "github.com/gogo/protobuf/proto" + "github.com/pborman/uuid" "k8s.io/kubernetes/contrib/mesos/pkg/offers" annotation "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics" mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" "k8s.io/kubernetes/pkg/api" - "github.com/gogo/protobuf/proto" - "github.com/pborman/uuid" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" diff --git a/contrib/mesos/pkg/scheduler/podtask/pod_task_test.go b/contrib/mesos/pkg/scheduler/podtask/pod_task_test.go index 930738719be..3a66ed412ae 100644 --- a/contrib/mesos/pkg/scheduler/podtask/pod_task_test.go +++ b/contrib/mesos/pkg/scheduler/podtask/pod_task_test.go @@ -19,11 +19,11 @@ package podtask import ( "testing" + mesos "github.com/mesos/mesos-go/mesosproto" + mutil "github.com/mesos/mesos-go/mesosutil" mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - mesos "github.com/mesos/mesos-go/mesosproto" - mutil "github.com/mesos/mesos-go/mesosutil" "github.com/stretchr/testify/assert" ) diff --git a/contrib/mesos/pkg/scheduler/podtask/port_mapping.go b/contrib/mesos/pkg/scheduler/podtask/port_mapping.go index 5da4942e4d9..bd95153f405 100644 --- a/contrib/mesos/pkg/scheduler/podtask/port_mapping.go +++ b/contrib/mesos/pkg/scheduler/podtask/port_mapping.go @@ -19,10 +19,10 @@ package podtask import ( "fmt" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/labels" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/labels" ) type HostPortMappingType string diff --git a/contrib/mesos/pkg/scheduler/podtask/port_mapping_test.go b/contrib/mesos/pkg/scheduler/podtask/port_mapping_test.go index 20d2d4ef8db..9ff9b8df388 100644 --- a/contrib/mesos/pkg/scheduler/podtask/port_mapping_test.go +++ b/contrib/mesos/pkg/scheduler/podtask/port_mapping_test.go @@ -19,8 +19,8 @@ package podtask import ( "testing" - "k8s.io/kubernetes/pkg/api" mesos "github.com/mesos/mesos-go/mesosproto" + "k8s.io/kubernetes/pkg/api" ) func TestDefaultHostPortMatching(t *testing.T) { diff --git a/contrib/mesos/pkg/scheduler/podtask/registry.go b/contrib/mesos/pkg/scheduler/podtask/registry.go index 3641d42228e..7de33959030 100644 --- a/contrib/mesos/pkg/scheduler/podtask/registry.go +++ b/contrib/mesos/pkg/scheduler/podtask/registry.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics" - "k8s.io/kubernetes/pkg/api" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics" + "k8s.io/kubernetes/pkg/api" ) const ( diff --git a/contrib/mesos/pkg/scheduler/podtask/registry_test.go b/contrib/mesos/pkg/scheduler/podtask/registry_test.go index 69bfe474425..bdc2a0be10a 100644 --- a/contrib/mesos/pkg/scheduler/podtask/registry_test.go +++ b/contrib/mesos/pkg/scheduler/podtask/registry_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "k8s.io/kubernetes/contrib/mesos/pkg/offers" - "k8s.io/kubernetes/contrib/mesos/pkg/proc" mesos "github.com/mesos/mesos-go/mesosproto" "github.com/mesos/mesos-go/mesosutil" "github.com/stretchr/testify/assert" + "k8s.io/kubernetes/contrib/mesos/pkg/offers" + "k8s.io/kubernetes/contrib/mesos/pkg/proc" ) func TestInMemoryRegistry_RegisterGetUnregister(t *testing.T) { diff --git a/contrib/mesos/pkg/scheduler/scheduler.go b/contrib/mesos/pkg/scheduler/scheduler.go index 5a9e310b9f9..a7977060f67 100644 --- a/contrib/mesos/pkg/scheduler/scheduler.go +++ b/contrib/mesos/pkg/scheduler/scheduler.go @@ -25,6 +25,10 @@ import ( "sync" "time" + log "github.com/golang/glog" + mesos "github.com/mesos/mesos-go/mesosproto" + mutil "github.com/mesos/mesos-go/mesosutil" + bindings "github.com/mesos/mesos-go/scheduler" execcfg "k8s.io/kubernetes/contrib/mesos/pkg/executor/config" "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" "k8s.io/kubernetes/contrib/mesos/pkg/offers" @@ -45,10 +49,6 @@ import ( "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/tools" "k8s.io/kubernetes/pkg/util" - log "github.com/golang/glog" - mesos "github.com/mesos/mesos-go/mesosproto" - mutil "github.com/mesos/mesos-go/mesosutil" - bindings "github.com/mesos/mesos-go/scheduler" ) type Slave struct { diff --git a/contrib/mesos/pkg/scheduler/scheduler_test.go b/contrib/mesos/pkg/scheduler/scheduler_test.go index 4c526337738..79beadb2be2 100644 --- a/contrib/mesos/pkg/scheduler/scheduler_test.go +++ b/contrib/mesos/pkg/scheduler/scheduler_test.go @@ -19,13 +19,13 @@ package scheduler import ( "testing" + mesos "github.com/mesos/mesos-go/mesosproto" + util "github.com/mesos/mesos-go/mesosutil" + "github.com/stretchr/testify/assert" "k8s.io/kubernetes/contrib/mesos/pkg/offers" "k8s.io/kubernetes/contrib/mesos/pkg/proc" schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" - mesos "github.com/mesos/mesos-go/mesosproto" - util "github.com/mesos/mesos-go/mesosutil" - "github.com/stretchr/testify/assert" ) // Check that same slave is only added once. diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index 058fc2eca21..56292aeffe0 100644 --- a/contrib/mesos/pkg/scheduler/service/service.go +++ b/contrib/mesos/pkg/scheduler/service/service.go @@ -32,6 +32,19 @@ import ( "sync" "time" + "github.com/coreos/go-etcd/etcd" + "github.com/gogo/protobuf/proto" + log "github.com/golang/glog" + "github.com/kardianos/osext" + "github.com/mesos/mesos-go/auth" + "github.com/mesos/mesos-go/auth/sasl" + "github.com/mesos/mesos-go/auth/sasl/mech" + mesos "github.com/mesos/mesos-go/mesosproto" + mutil "github.com/mesos/mesos-go/mesosutil" + bindings "github.com/mesos/mesos-go/scheduler" + "github.com/prometheus/client_golang/prometheus" + "github.com/spf13/pflag" + "golang.org/x/net/context" "k8s.io/kubernetes/contrib/mesos/pkg/archive" "k8s.io/kubernetes/contrib/mesos/pkg/election" execcfg "k8s.io/kubernetes/contrib/mesos/pkg/executor/config" @@ -54,19 +67,6 @@ import ( etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" "k8s.io/kubernetes/pkg/tools" "k8s.io/kubernetes/pkg/util" - "github.com/coreos/go-etcd/etcd" - "github.com/gogo/protobuf/proto" - log "github.com/golang/glog" - "github.com/kardianos/osext" - "github.com/mesos/mesos-go/auth" - "github.com/mesos/mesos-go/auth/sasl" - "github.com/mesos/mesos-go/auth/sasl/mech" - mesos "github.com/mesos/mesos-go/mesosproto" - mutil "github.com/mesos/mesos-go/mesosutil" - bindings "github.com/mesos/mesos-go/scheduler" - "github.com/prometheus/client_golang/prometheus" - "github.com/spf13/pflag" - "golang.org/x/net/context" ) const ( diff --git a/contrib/service-loadbalancer/service_loadbalancer.go b/contrib/service-loadbalancer/service_loadbalancer.go index 65978809cdb..1fb72d2dab4 100644 --- a/contrib/service-loadbalancer/service_loadbalancer.go +++ b/contrib/service-loadbalancer/service_loadbalancer.go @@ -30,6 +30,8 @@ import ( "text/template" "time" + "github.com/golang/glog" + flag "github.com/spf13/pflag" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/client/cache" @@ -38,8 +40,6 @@ import ( kubectl_util "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/workqueue" - "github.com/golang/glog" - flag "github.com/spf13/pflag" ) const ( diff --git a/examples/elasticsearch/elasticsearch_discovery.go b/examples/elasticsearch/elasticsearch_discovery.go index 17d02b770e7..81180fc5c35 100644 --- a/examples/elasticsearch/elasticsearch_discovery.go +++ b/examples/elasticsearch/elasticsearch_discovery.go @@ -23,11 +23,11 @@ import ( "strings" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" - "github.com/golang/glog" ) var ( diff --git a/examples/examples_test.go b/examples/examples_test.go index b69569d055a..288b7f0f41d 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -25,6 +25,7 @@ import ( "strings" "testing" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/validation" @@ -33,7 +34,6 @@ import ( "k8s.io/kubernetes/pkg/util/yaml" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapilatest "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest" - "github.com/golang/glog" ) func validateObject(obj runtime.Object) (errors []error) { diff --git a/examples/https-nginx/make_secret.go b/examples/https-nginx/make_secret.go index 91dd2948789..67a93ee70ba 100644 --- a/examples/https-nginx/make_secret.go +++ b/examples/https-nginx/make_secret.go @@ -23,10 +23,10 @@ package main import ( "flag" "fmt" + "io/ioutil" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/runtime" - "io/ioutil" "log" ) diff --git a/pkg/admission/plugins.go b/pkg/admission/plugins.go index 15226d63cae..c8abd815b4f 100644 --- a/pkg/admission/plugins.go +++ b/pkg/admission/plugins.go @@ -21,8 +21,8 @@ import ( "os" "sync" - "k8s.io/kubernetes/pkg/client" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/client" ) // Factory is a function that returns an Interface for admission decisions. diff --git a/pkg/api/context.go b/pkg/api/context.go index 7b204d3f83f..a065e059ead 100644 --- a/pkg/api/context.go +++ b/pkg/api/context.go @@ -19,8 +19,8 @@ package api import ( stderrs "errors" - "k8s.io/kubernetes/pkg/auth/user" "golang.org/x/net/context" + "k8s.io/kubernetes/pkg/auth/user" ) // Context carries values across API boundaries. diff --git a/pkg/api/endpoints/util_test.go b/pkg/api/endpoints/util_test.go index 38eb8597d73..57dcaeb2e34 100644 --- a/pkg/api/endpoints/util_test.go +++ b/pkg/api/endpoints/util_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/api" "github.com/davecgh/go-spew/spew" + "k8s.io/kubernetes/pkg/api" ) func TestPackSubsets(t *testing.T) { diff --git a/pkg/api/rest/resttest/resttest.go b/pkg/api/rest/resttest/resttest.go index b8b55643245..547ee55596d 100644 --- a/pkg/api/rest/resttest/resttest.go +++ b/pkg/api/rest/resttest/resttest.go @@ -20,13 +20,13 @@ import ( "strings" "testing" + "github.com/coreos/go-etcd/etcd" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/tools" "k8s.io/kubernetes/pkg/util" - "github.com/coreos/go-etcd/etcd" ) type Tester struct { diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index e6e20504db8..03b9875ab93 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -23,6 +23,7 @@ import ( "reflect" "testing" + "github.com/davecgh/go-spew/spew" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/meta" @@ -30,7 +31,6 @@ import ( apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" - "github.com/davecgh/go-spew/spew" flag "github.com/spf13/pflag" ) diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index b6e75d7f201..9c39a51c488 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -22,6 +22,7 @@ import ( "strconv" "testing" + docker "github.com/fsouza/go-dockerclient" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/registered" "k8s.io/kubernetes/pkg/api/resource" @@ -30,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" - docker "github.com/fsouza/go-dockerclient" "github.com/google/gofuzz" "speter.net/go/exp/math/dec/inf" diff --git a/pkg/api/validation/schema.go b/pkg/api/validation/schema.go index d06f75ee83e..ec3bd23a38d 100644 --- a/pkg/api/validation/schema.go +++ b/pkg/api/validation/schema.go @@ -22,11 +22,11 @@ import ( "reflect" "strings" + "github.com/emicklei/go-restful/swagger" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/util/errors" errs "k8s.io/kubernetes/pkg/util/fielderrors" "k8s.io/kubernetes/pkg/util/yaml" - "github.com/emicklei/go-restful/swagger" - "github.com/golang/glog" ) type InvalidTypeError struct { diff --git a/pkg/apiserver/handlers.go b/pkg/apiserver/handlers.go index a611feae757..706e42854f4 100644 --- a/pkg/apiserver/handlers.go +++ b/pkg/apiserver/handlers.go @@ -28,13 +28,13 @@ import ( "sync" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/httplog" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) // specialVerbs contains just strings which are used in REST paths for special actions that don't fall under the normal diff --git a/pkg/apiserver/proxy.go b/pkg/apiserver/proxy.go index 260b3d85ba4..a36a26a0ade 100644 --- a/pkg/apiserver/proxy.go +++ b/pkg/apiserver/proxy.go @@ -39,8 +39,8 @@ import ( "k8s.io/kubernetes/pkg/util/httpstream" proxyutil "k8s.io/kubernetes/pkg/util/proxy" - "k8s.io/kubernetes/third_party/golang/netutil" "github.com/golang/glog" + "k8s.io/kubernetes/third_party/golang/netutil" ) // ProxyHandler provides a http.Handler which will proxy traffic to locations diff --git a/pkg/apiserver/proxy_test.go b/pkg/apiserver/proxy_test.go index a666eb63dbb..b4a347dc29c 100644 --- a/pkg/apiserver/proxy_test.go +++ b/pkg/apiserver/proxy_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "k8s.io/kubernetes/pkg/api/rest" "golang.org/x/net/websocket" + "k8s.io/kubernetes/pkg/api/rest" ) func TestProxy(t *testing.T) { diff --git a/pkg/apiserver/watch_test.go b/pkg/apiserver/watch_test.go index 64f9a40504d..74e799f4c3c 100644 --- a/pkg/apiserver/watch_test.go +++ b/pkg/apiserver/watch_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" + "golang.org/x/net/websocket" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" - "golang.org/x/net/websocket" ) // watchJSON defines the expected JSON wire equivalent of watch.Event diff --git a/pkg/auth/handlers/handlers.go b/pkg/auth/handlers/handlers.go index d3b2a9b766b..ac316763ab9 100644 --- a/pkg/auth/handlers/handlers.go +++ b/pkg/auth/handlers/handlers.go @@ -19,9 +19,9 @@ package handlers import ( "net/http" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/auth/authenticator" - "github.com/golang/glog" ) // NewRequestAuthenticator creates an http handler that tries to authenticate the given request as a user, and then diff --git a/pkg/client/cache/expiration_cache.go b/pkg/client/cache/expiration_cache.go index a135569ad75..077a38755dc 100644 --- a/pkg/client/cache/expiration_cache.go +++ b/pkg/client/cache/expiration_cache.go @@ -17,8 +17,8 @@ limitations under the License. package cache import ( - "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util" "time" ) diff --git a/pkg/client/cache/listers.go b/pkg/client/cache/listers.go index 36af48af043..2cfcb3d5cdd 100644 --- a/pkg/client/cache/listers.go +++ b/pkg/client/cache/listers.go @@ -19,9 +19,9 @@ package cache import ( "fmt" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/labels" - "github.com/golang/glog" ) // TODO: generate these classes and methods for all resources of interest using diff --git a/pkg/client/cache/poller.go b/pkg/client/cache/poller.go index 7b0e5ff5e89..0af3a75d49b 100644 --- a/pkg/client/cache/poller.go +++ b/pkg/client/cache/poller.go @@ -19,8 +19,8 @@ package cache import ( "time" - "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util" ) // Enumerator should be able to return the list of objects to be synced with diff --git a/pkg/client/cache/reflector.go b/pkg/client/cache/reflector.go index abf84a4c553..5e6563b81b4 100644 --- a/pkg/client/cache/reflector.go +++ b/pkg/client/cache/reflector.go @@ -29,12 +29,12 @@ import ( "syscall" "time" + "github.com/golang/glog" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" - "github.com/golang/glog" ) // ListerWatcher is any object that knows how to perform an initial list and start a watch on a resource. diff --git a/pkg/client/helper.go b/pkg/client/helper.go index 83eac1a457c..45800c50e27 100644 --- a/pkg/client/helper.go +++ b/pkg/client/helper.go @@ -29,12 +29,12 @@ import ( "strings" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/version" - "github.com/golang/glog" ) // Config holds the common attributes that can be passed to a Kubernetes client on diff --git a/pkg/client/portforward/portforward.go b/pkg/client/portforward/portforward.go index 057b4f979a2..a7dfe159613 100644 --- a/pkg/client/portforward/portforward.go +++ b/pkg/client/portforward/portforward.go @@ -26,11 +26,11 @@ import ( "strconv" "strings" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream/spdy" - "github.com/golang/glog" ) type upgrader interface { diff --git a/pkg/client/record/events_cache.go b/pkg/client/record/events_cache.go index bcf39872458..a544780ef44 100644 --- a/pkg/client/record/events_cache.go +++ b/pkg/client/record/events_cache.go @@ -19,9 +19,9 @@ package record import ( "sync" + "github.com/golang/groupcache/lru" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/util" - "github.com/golang/groupcache/lru" ) type history struct { diff --git a/pkg/client/remotecommand/remotecommand.go b/pkg/client/remotecommand/remotecommand.go index 639bd0131fd..91b83bde8be 100644 --- a/pkg/client/remotecommand/remotecommand.go +++ b/pkg/client/remotecommand/remotecommand.go @@ -22,13 +22,13 @@ import ( "io/ioutil" "net/http" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/conversion/queryparams" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream/spdy" - "github.com/golang/glog" ) type upgrader interface { diff --git a/pkg/client/request.go b/pkg/client/request.go index ff6068f6ec3..d195917d90a 100644 --- a/pkg/client/request.go +++ b/pkg/client/request.go @@ -30,6 +30,7 @@ import ( "strings" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/metrics" @@ -40,7 +41,6 @@ import ( "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/watch" watchjson "k8s.io/kubernetes/pkg/watch/json" - "github.com/golang/glog" ) // specialParams lists parameters that are handled specially and which users of Request diff --git a/pkg/cloudprovider/aws/aws_routes.go b/pkg/cloudprovider/aws/aws_routes.go index c0156fd43f2..5d8025a7793 100644 --- a/pkg/cloudprovider/aws/aws_routes.go +++ b/pkg/cloudprovider/aws/aws_routes.go @@ -18,9 +18,9 @@ package aws_cloud import ( "fmt" - "k8s.io/kubernetes/pkg/cloudprovider" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "k8s.io/kubernetes/pkg/cloudprovider" ) func (s *AWSCloud) findRouteTable(clusterName string) (*ec2.RouteTable, error) { diff --git a/pkg/cloudprovider/aws/aws_test.go b/pkg/cloudprovider/aws/aws_test.go index c8c7a1676bb..7dc4336420d 100644 --- a/pkg/cloudprovider/aws/aws_test.go +++ b/pkg/cloudprovider/aws/aws_test.go @@ -26,10 +26,10 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/elb" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/resource" "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" ) const TestClusterId = "clusterid.test" diff --git a/pkg/cloudprovider/mesos/client.go b/pkg/cloudprovider/mesos/client.go index 860b2e15f4b..4b01f0c43cc 100644 --- a/pkg/cloudprovider/mesos/client.go +++ b/pkg/cloudprovider/mesos/client.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/resource" log "github.com/golang/glog" "github.com/mesos/mesos-go/detector" mesos "github.com/mesos/mesos-go/mesosproto" "golang.org/x/net/context" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" ) const defaultClusterName = "mesos" diff --git a/pkg/cloudprovider/mesos/mesos.go b/pkg/cloudprovider/mesos/mesos.go index da11153f771..19dea136cf6 100644 --- a/pkg/cloudprovider/mesos/mesos.go +++ b/pkg/cloudprovider/mesos/mesos.go @@ -23,11 +23,11 @@ import ( "net" "regexp" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/cloudprovider" 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" ) var ( diff --git a/pkg/cloudprovider/openstack/openstack.go b/pkg/cloudprovider/openstack/openstack.go index 9f5f4d1d37f..443b467f9c2 100644 --- a/pkg/cloudprovider/openstack/openstack.go +++ b/pkg/cloudprovider/openstack/openstack.go @@ -36,10 +36,10 @@ import ( "github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips" "github.com/rackspace/gophercloud/pagination" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/cloudprovider" - "github.com/golang/glog" ) const ProviderName = "openstack" diff --git a/pkg/cloudprovider/rackspace/rackspace.go b/pkg/cloudprovider/rackspace/rackspace.go index f05ecb03ba3..f87bf0eb9b9 100644 --- a/pkg/cloudprovider/rackspace/rackspace.go +++ b/pkg/cloudprovider/rackspace/rackspace.go @@ -32,10 +32,10 @@ import ( "github.com/rackspace/gophercloud/rackspace/compute/v2/flavors" "github.com/rackspace/gophercloud/rackspace/compute/v2/servers" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/cloudprovider" - "github.com/golang/glog" ) const ProviderName = "rackspace" diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 9e253c211f8..87ae47a8a27 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -20,6 +20,7 @@ import ( "fmt" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/validation" @@ -29,7 +30,6 @@ import ( "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" - "github.com/golang/glog" "sync/atomic" ) diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index e6b72bf70c8..b7f4c15ddbd 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -22,6 +22,7 @@ import ( "net" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/client/record" @@ -30,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) var ( diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index 4dafe4d9b93..412b1750b85 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -22,6 +22,7 @@ import ( "sync" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/client/cache" @@ -34,7 +35,6 @@ import ( "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/workqueue" "k8s.io/kubernetes/pkg/watch" - "github.com/golang/glog" ) const ( diff --git a/pkg/controller/replication/replication_controller_utils.go b/pkg/controller/replication/replication_controller_utils.go index 45f50c34ac2..3ed9909844a 100644 --- a/pkg/controller/replication/replication_controller_utils.go +++ b/pkg/controller/replication/replication_controller_utils.go @@ -17,9 +17,9 @@ limitations under the License. package replicationcontroller import ( + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" - "github.com/golang/glog" ) // updateReplicaCount attempts to update the Status.Replicas of the given controller, with a single GET/PUT retry. diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index 07880262f48..53777645fcf 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -19,13 +19,13 @@ package resourcequotacontroller import ( "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) // ResourceQuotaController is responsible for tracking quota usage status in the system diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index d6669280211..f058670e03c 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -21,13 +21,13 @@ import ( "net" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) type RouteController struct { diff --git a/pkg/controller/service/servicecontroller.go b/pkg/controller/service/servicecontroller.go index 9a218b3013e..80258ac14e3 100644 --- a/pkg/controller/service/servicecontroller.go +++ b/pkg/controller/service/servicecontroller.go @@ -23,6 +23,7 @@ import ( "sync" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client" @@ -32,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) const ( diff --git a/pkg/controller/serviceaccount/jwt_test.go b/pkg/controller/serviceaccount/jwt_test.go index 8ff21d8968c..5598ed0df88 100644 --- a/pkg/controller/serviceaccount/jwt_test.go +++ b/pkg/controller/serviceaccount/jwt_test.go @@ -23,10 +23,10 @@ import ( "reflect" "testing" + "github.com/dgrijalva/jwt-go" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/client/testclient" - "github.com/dgrijalva/jwt-go" ) const otherPublicKey = `-----BEGIN PUBLIC KEY----- diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go index 31e5428f11d..ed253e86a6b 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -20,6 +20,7 @@ import ( "fmt" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/client" @@ -30,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" - "github.com/golang/glog" ) // nameIndexFunc is an index function that indexes based on an object's name diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index de5918131a1..9583cf8a425 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -21,6 +21,7 @@ import ( "fmt" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client" @@ -32,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" - "github.com/golang/glog" ) // TokensControllerOptions contains options for the TokensController diff --git a/pkg/credentialprovider/gcp/jwt.go b/pkg/credentialprovider/gcp/jwt.go index dfa88f6c69f..3c1a05d4bae 100644 --- a/pkg/credentialprovider/gcp/jwt.go +++ b/pkg/credentialprovider/gcp/jwt.go @@ -20,11 +20,11 @@ import ( "io/ioutil" "time" - "k8s.io/kubernetes/pkg/credentialprovider" "github.com/golang/glog" "golang.org/x/oauth2" "golang.org/x/oauth2/google" "golang.org/x/oauth2/jwt" + "k8s.io/kubernetes/pkg/credentialprovider" "github.com/spf13/pflag" ) diff --git a/pkg/credentialprovider/gcp/metadata.go b/pkg/credentialprovider/gcp/metadata.go index 146f1931b68..60c771955ab 100644 --- a/pkg/credentialprovider/gcp/metadata.go +++ b/pkg/credentialprovider/gcp/metadata.go @@ -22,8 +22,8 @@ import ( "strings" "time" - "k8s.io/kubernetes/pkg/credentialprovider" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/credentialprovider" ) const ( diff --git a/pkg/kubectl/bash_comp_utils.go b/pkg/kubectl/bash_comp_utils.go index c3b31a42684..6908fca3481 100644 --- a/pkg/kubectl/bash_comp_utils.go +++ b/pkg/kubectl/bash_comp_utils.go @@ -19,9 +19,9 @@ limitations under the License. package kubectl import ( - "k8s.io/kubernetes/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" + "k8s.io/kubernetes/pkg/util" ) func AddJsonFilenameFlag(cmd *cobra.Command, value *util.StringList, usage string) { diff --git a/pkg/kubectl/cmd/annotation.go b/pkg/kubectl/cmd/annotation.go index 63c8bd37fe4..89a1ae56f99 100644 --- a/pkg/kubectl/cmd/annotation.go +++ b/pkg/kubectl/cmd/annotation.go @@ -22,11 +22,11 @@ import ( "io" "strings" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/runtime" - "github.com/spf13/cobra" ) // AnnotateOptions have the data required to perform the annotate operation diff --git a/pkg/kubectl/cmd/attach.go b/pkg/kubectl/cmd/attach.go index ef60fcfcd1e..07848233eb2 100644 --- a/pkg/kubectl/cmd/attach.go +++ b/pkg/kubectl/cmd/attach.go @@ -23,13 +23,13 @@ import ( "os/signal" "syscall" + "github.com/docker/docker/pkg/term" + "github.com/golang/glog" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/client/remotecommand" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "github.com/docker/docker/pkg/term" - "github.com/golang/glog" - "github.com/spf13/cobra" ) const ( diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 1c3579ef9a8..f4725647023 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -19,10 +19,10 @@ package cmd import ( "io" + "github.com/golang/glog" cmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/exec.go b/pkg/kubectl/cmd/exec.go index 90256ffaca7..68689ccba45 100644 --- a/pkg/kubectl/cmd/exec.go +++ b/pkg/kubectl/cmd/exec.go @@ -23,13 +23,13 @@ import ( "os/signal" "syscall" + "github.com/docker/docker/pkg/term" + "github.com/golang/glog" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/client/remotecommand" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "github.com/docker/docker/pkg/term" - "github.com/golang/glog" - "github.com/spf13/cobra" ) const ( diff --git a/pkg/kubectl/cmd/label.go b/pkg/kubectl/cmd/label.go index 80432048a26..ce874580e8c 100644 --- a/pkg/kubectl/cmd/label.go +++ b/pkg/kubectl/cmd/label.go @@ -21,12 +21,12 @@ import ( "io" "strings" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" - "github.com/spf13/cobra" ) const ( diff --git a/pkg/kubectl/cmd/log.go b/pkg/kubectl/cmd/log.go index 76d763c5754..810fd4b3a87 100644 --- a/pkg/kubectl/cmd/log.go +++ b/pkg/kubectl/cmd/log.go @@ -22,10 +22,10 @@ import ( "os" "strconv" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" libutil "k8s.io/kubernetes/pkg/util" - "github.com/spf13/cobra" ) const ( diff --git a/pkg/kubectl/cmd/namespace.go b/pkg/kubectl/cmd/namespace.go index 38e4e6a3397..cd3a12d4d5b 100644 --- a/pkg/kubectl/cmd/namespace.go +++ b/pkg/kubectl/cmd/namespace.go @@ -20,8 +20,8 @@ import ( "fmt" "io" - "k8s.io/kubernetes/pkg/kubectl/cmd/util" "github.com/spf13/cobra" + "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) // TODO remove once people have been given enough time to notice diff --git a/pkg/kubectl/cmd/portforward.go b/pkg/kubectl/cmd/portforward.go index 53b6f70174f..196d8f2a321 100644 --- a/pkg/kubectl/cmd/portforward.go +++ b/pkg/kubectl/cmd/portforward.go @@ -20,12 +20,12 @@ import ( "os" "os/signal" + "github.com/golang/glog" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/client/portforward" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "github.com/golang/glog" - "github.com/spf13/cobra" ) const ( diff --git a/pkg/kubectl/cmd/proxy.go b/pkg/kubectl/cmd/proxy.go index b277546c91d..21c473c3d8d 100644 --- a/pkg/kubectl/cmd/proxy.go +++ b/pkg/kubectl/cmd/proxy.go @@ -21,10 +21,10 @@ import ( "io" "strings" - "k8s.io/kubernetes/pkg/kubectl" - cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "github.com/golang/glog" "github.com/spf13/cobra" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) const ( diff --git a/pkg/kubectl/cmd/replace.go b/pkg/kubectl/cmd/replace.go index c69513af9ba..21ce9fffcc8 100644 --- a/pkg/kubectl/cmd/replace.go +++ b/pkg/kubectl/cmd/replace.go @@ -25,11 +25,11 @@ import ( "github.com/spf13/cobra" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) const ( diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate.go index 0ede91da05c..d81fd2e91df 100644 --- a/pkg/kubectl/cmd/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate.go @@ -24,13 +24,13 @@ import ( "github.com/golang/glog" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" - "github.com/spf13/cobra" ) const ( diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index 8c9bf3b9bdc..aba473a5186 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -21,10 +21,10 @@ import ( "io" "os" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "github.com/spf13/cobra" ) const ( diff --git a/pkg/kubectl/cmd/stop.go b/pkg/kubectl/cmd/stop.go index ad24ae5cb66..fb999414eb8 100644 --- a/pkg/kubectl/cmd/stop.go +++ b/pkg/kubectl/cmd/stop.go @@ -19,11 +19,11 @@ package cmd import ( "io" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/util" - "github.com/spf13/cobra" ) const ( diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go index d2cf988c25b..91e48c0b3e0 100644 --- a/pkg/kubectl/cmd/util/helpers.go +++ b/pkg/kubectl/cmd/util/helpers.go @@ -29,6 +29,7 @@ import ( "strings" "time" + "github.com/evanphx/json-patch" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/latest" @@ -38,7 +39,6 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" utilerrors "k8s.io/kubernetes/pkg/util/errors" - "github.com/evanphx/json-patch" "github.com/golang/glog" "github.com/spf13/cobra" diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index bf0a0400e31..083bd45dbb8 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -25,6 +25,7 @@ import ( "strings" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/client" @@ -33,7 +34,6 @@ import ( "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) // Describer generates output for the named resource or an error diff --git a/pkg/kubectl/generate.go b/pkg/kubectl/generate.go index 13e18cb3161..ab8a3c9c3bb 100644 --- a/pkg/kubectl/generate.go +++ b/pkg/kubectl/generate.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "k8s.io/kubernetes/pkg/runtime" "github.com/spf13/cobra" + "k8s.io/kubernetes/pkg/runtime" ) // GeneratorParam is a parameter for a generator diff --git a/pkg/kubectl/proxy_server.go b/pkg/kubectl/proxy_server.go index af0731ed70c..d1e0e9bfdee 100644 --- a/pkg/kubectl/proxy_server.go +++ b/pkg/kubectl/proxy_server.go @@ -26,8 +26,8 @@ import ( "strings" "time" - "k8s.io/kubernetes/pkg/client" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/client" ) const ( diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index dd829bc09ed..ab961ffcfb8 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -29,13 +29,13 @@ import ( "text/template" "time" + "github.com/ghodss/yaml" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/volume" - "github.com/ghodss/yaml" - "github.com/golang/glog" ) // GetPrinter takes a format type, an optional format argument. It will return true diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 561d3a01dda..649998031cc 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -23,7 +23,6 @@ import ( "net/http" "time" - "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" "github.com/google/cadvisor/cache/memory" "github.com/google/cadvisor/events" @@ -33,6 +32,7 @@ import ( cadvisorApiV2 "github.com/google/cadvisor/info/v2" "github.com/google/cadvisor/manager" "github.com/google/cadvisor/utils/sysfs" + "k8s.io/kubernetes/pkg/util" ) type cadvisorClient struct { diff --git a/pkg/kubelet/config/config.go b/pkg/kubelet/config/config.go index 0d45715caac..f36ed45a028 100644 --- a/pkg/kubelet/config/config.go +++ b/pkg/kubelet/config/config.go @@ -21,6 +21,7 @@ import ( "reflect" "sync" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/client/record" @@ -32,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/util/config" utilerrors "k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/util/fielderrors" - "github.com/golang/glog" ) // PodConfigNotificationMode describes how changes are sent to the update channel. diff --git a/pkg/kubelet/container_bridge.go b/pkg/kubelet/container_bridge.go index 1f7f6328fbb..d37497d12f9 100644 --- a/pkg/kubelet/container_bridge.go +++ b/pkg/kubelet/container_bridge.go @@ -23,8 +23,8 @@ import ( "os/exec" "regexp" - "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util" ) var cidrRegexp = regexp.MustCompile(`inet ([0-9a-fA-F.:]*/[0-9]*)`) diff --git a/pkg/kubelet/container_gc.go b/pkg/kubelet/container_gc.go index ad56ef4e459..95027a3574e 100644 --- a/pkg/kubelet/container_gc.go +++ b/pkg/kubelet/container_gc.go @@ -24,10 +24,10 @@ import ( "sort" "time" - "k8s.io/kubernetes/pkg/kubelet/dockertools" - "k8s.io/kubernetes/pkg/types" docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/types" ) // Specified a policy for garbage collecting containers. diff --git a/pkg/kubelet/container_gc_test.go b/pkg/kubelet/container_gc_test.go index 4ffe5648c35..c943a2fbc82 100644 --- a/pkg/kubelet/container_gc_test.go +++ b/pkg/kubelet/container_gc_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/kubelet/dockertools" docker "github.com/fsouza/go-dockerclient" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "k8s.io/kubernetes/pkg/kubelet/dockertools" ) func newTestContainerGC(t *testing.T, MinAge time.Duration, MaxPerPodContainer, MaxContainers int) (containerGC, *dockertools.FakeDockerClient) { diff --git a/pkg/kubelet/container_manager_linux.go b/pkg/kubelet/container_manager_linux.go index c3cda623af9..79b76bb0497 100644 --- a/pkg/kubelet/container_manager_linux.go +++ b/pkg/kubelet/container_manager_linux.go @@ -26,15 +26,15 @@ import ( "strings" "time" + "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups/fs" + "github.com/docker/libcontainer/configs" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/errors" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/cgroups/fs" - "github.com/docker/libcontainer/configs" - "github.com/golang/glog" ) const ( diff --git a/pkg/kubelet/disk_manager.go b/pkg/kubelet/disk_manager.go index e1e710ba2a5..15d63ab47b2 100644 --- a/pkg/kubelet/disk_manager.go +++ b/pkg/kubelet/disk_manager.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/kubelet/cadvisor" "github.com/golang/glog" cadvisorApi "github.com/google/cadvisor/info/v2" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" ) // Manages policy for diskspace management for disks holding docker images and root fs. diff --git a/pkg/kubelet/disk_manager_test.go b/pkg/kubelet/disk_manager_test.go index 278d96ebd3a..30474fd7920 100644 --- a/pkg/kubelet/disk_manager_test.go +++ b/pkg/kubelet/disk_manager_test.go @@ -20,10 +20,10 @@ import ( "fmt" "testing" - "k8s.io/kubernetes/pkg/kubelet/cadvisor" cadvisorApi "github.com/google/cadvisor/info/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" ) func testPolicy() DiskSpacePolicy { diff --git a/pkg/kubelet/dockertools/convert.go b/pkg/kubelet/dockertools/convert.go index 05fb9a5eb46..584682cc011 100644 --- a/pkg/kubelet/dockertools/convert.go +++ b/pkg/kubelet/dockertools/convert.go @@ -19,9 +19,9 @@ package dockertools import ( "fmt" + docker "github.com/fsouza/go-dockerclient" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/types" - docker "github.com/fsouza/go-dockerclient" ) // This file contains helper functions to convert docker API types to runtime diff --git a/pkg/kubelet/dockertools/convert_test.go b/pkg/kubelet/dockertools/convert_test.go index 92217df835a..1fee5aff02a 100644 --- a/pkg/kubelet/dockertools/convert_test.go +++ b/pkg/kubelet/dockertools/convert_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" + docker "github.com/fsouza/go-dockerclient" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/types" - docker "github.com/fsouza/go-dockerclient" ) func TestToRuntimeContainer(t *testing.T) { diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go index 9f20e91b93d..e02c704bb9f 100644 --- a/pkg/kubelet/dockertools/docker.go +++ b/pkg/kubelet/dockertools/docker.go @@ -25,6 +25,10 @@ import ( "strconv" "strings" + "github.com/docker/docker/pkg/jsonmessage" + "github.com/docker/docker/pkg/parsers" + docker "github.com/fsouza/go-dockerclient" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/credentialprovider" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -33,10 +37,6 @@ import ( "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" utilerrors "k8s.io/kubernetes/pkg/util/errors" - "github.com/docker/docker/pkg/jsonmessage" - "github.com/docker/docker/pkg/parsers" - docker "github.com/fsouza/go-dockerclient" - "github.com/golang/glog" ) const ( diff --git a/pkg/kubelet/dockertools/docker_test.go b/pkg/kubelet/dockertools/docker_test.go index 6a9bca3dfba..7a2b332ae2b 100644 --- a/pkg/kubelet/dockertools/docker_test.go +++ b/pkg/kubelet/dockertools/docker_test.go @@ -25,6 +25,8 @@ import ( "strings" "testing" + "github.com/docker/docker/pkg/jsonmessage" + docker "github.com/fsouza/go-dockerclient" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/credentialprovider" @@ -32,8 +34,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/network" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" - "github.com/docker/docker/pkg/jsonmessage" - docker "github.com/fsouza/go-dockerclient" ) func verifyCalls(t *testing.T, fakeDocker *FakeDockerClient, calls []string) { diff --git a/pkg/kubelet/dockertools/exec.go b/pkg/kubelet/dockertools/exec.go index 234b5ae156e..426b5fb2e03 100644 --- a/pkg/kubelet/dockertools/exec.go +++ b/pkg/kubelet/dockertools/exec.go @@ -23,9 +23,9 @@ import ( "os/exec" "time" - kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) // ExecHandler knows how to execute a command in a running Docker container. diff --git a/pkg/kubelet/dockertools/instrumented_docker.go b/pkg/kubelet/dockertools/instrumented_docker.go index c3c16e4a25f..62f3418b8f0 100644 --- a/pkg/kubelet/dockertools/instrumented_docker.go +++ b/pkg/kubelet/dockertools/instrumented_docker.go @@ -19,8 +19,8 @@ package dockertools import ( "time" - "k8s.io/kubernetes/pkg/kubelet/metrics" docker "github.com/fsouza/go-dockerclient" + "k8s.io/kubernetes/pkg/kubelet/metrics" ) type instrumentedDockerInterface struct { diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index e79f85779cc..8cd5cfa132a 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -31,6 +31,9 @@ import ( "sync" "time" + docker "github.com/fsouza/go-dockerclient" + "github.com/golang/glog" + "github.com/golang/groupcache/lru" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/client/record" @@ -44,9 +47,6 @@ import ( "k8s.io/kubernetes/pkg/securitycontext" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" - docker "github.com/fsouza/go-dockerclient" - "github.com/golang/glog" - "github.com/golang/groupcache/lru" ) const ( diff --git a/pkg/kubelet/dockertools/manager_test.go b/pkg/kubelet/dockertools/manager_test.go index 6b3fd3b40b5..096d1e4efee 100644 --- a/pkg/kubelet/dockertools/manager_test.go +++ b/pkg/kubelet/dockertools/manager_test.go @@ -30,6 +30,7 @@ import ( "testing" "time" + docker "github.com/fsouza/go-dockerclient" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/client/record" @@ -40,7 +41,6 @@ import ( "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" uexec "k8s.io/kubernetes/pkg/util/exec" - docker "github.com/fsouza/go-dockerclient" ) type fakeHTTP struct { diff --git a/pkg/kubelet/image_manager.go b/pkg/kubelet/image_manager.go index 95ae3803091..7d350f6919c 100644 --- a/pkg/kubelet/image_manager.go +++ b/pkg/kubelet/image_manager.go @@ -22,13 +22,13 @@ import ( "sync" "time" + docker "github.com/fsouza/go-dockerclient" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/util" - docker "github.com/fsouza/go-dockerclient" - "github.com/golang/glog" ) // Manages lifecycle of all images. diff --git a/pkg/kubelet/image_manager_test.go b/pkg/kubelet/image_manager_test.go index c215ef67679..2f02c90ebef 100644 --- a/pkg/kubelet/image_manager_test.go +++ b/pkg/kubelet/image_manager_test.go @@ -21,14 +21,14 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/kubelet/cadvisor" - "k8s.io/kubernetes/pkg/kubelet/dockertools" - "k8s.io/kubernetes/pkg/util" docker "github.com/fsouza/go-dockerclient" cadvisorApiV2 "github.com/google/cadvisor/info/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/util" ) var zero time.Time diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 969e28596af..cb38db812ed 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -33,6 +33,7 @@ import ( "sync" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" @@ -64,7 +65,6 @@ import ( "k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" "k8s.io/kubernetes/third_party/golang/expansion" - "github.com/golang/glog" cadvisorApi "github.com/google/cadvisor/info/v1" ) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index ec601d8c826..8f1b33b1e2d 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -31,6 +31,8 @@ import ( "testing" "time" + cadvisorApi "github.com/google/cadvisor/info/v1" + cadvisorApiv2 "github.com/google/cadvisor/info/v2" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" @@ -48,8 +50,6 @@ import ( "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/volume" _ "k8s.io/kubernetes/pkg/volume/host_path" - cadvisorApi "github.com/google/cadvisor/info/v1" - cadvisorApiv2 "github.com/google/cadvisor/info/v2" ) func init() { diff --git a/pkg/kubelet/lifecycle/handlers.go b/pkg/kubelet/lifecycle/handlers.go index 0084197237e..b8bcae6adb9 100644 --- a/pkg/kubelet/lifecycle/handlers.go +++ b/pkg/kubelet/lifecycle/handlers.go @@ -21,11 +21,11 @@ import ( "net" "strconv" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) type HandlerRunner struct { diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go index e94078f8468..251f2b06811 100644 --- a/pkg/kubelet/metrics/metrics.go +++ b/pkg/kubelet/metrics/metrics.go @@ -20,9 +20,9 @@ import ( "sync" "time" - kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) const ( diff --git a/pkg/kubelet/mirror_client.go b/pkg/kubelet/mirror_client.go index a190a172b74..ae54c33017c 100644 --- a/pkg/kubelet/mirror_client.go +++ b/pkg/kubelet/mirror_client.go @@ -19,10 +19,10 @@ package kubelet import ( "fmt" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "github.com/golang/glog" ) // Mirror client is used to create/delete a mirror pod. diff --git a/pkg/kubelet/network/exec/exec.go b/pkg/kubelet/network/exec/exec.go index ee1fdbceea7..b3a20d93942 100644 --- a/pkg/kubelet/network/exec/exec.go +++ b/pkg/kubelet/network/exec/exec.go @@ -54,10 +54,10 @@ import ( "path" "strings" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/kubelet/network" kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" utilexec "k8s.io/kubernetes/pkg/util/exec" - "github.com/golang/glog" ) type execNetworkPlugin struct { diff --git a/pkg/kubelet/network/plugins.go b/pkg/kubelet/network/plugins.go index c84514ff21a..55e788f1ada 100644 --- a/pkg/kubelet/network/plugins.go +++ b/pkg/kubelet/network/plugins.go @@ -20,12 +20,12 @@ import ( "fmt" "strings" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/errors" - "github.com/golang/glog" ) const DefaultPluginName = "kubernetes.io/no-op" diff --git a/pkg/kubelet/oom_watcher.go b/pkg/kubelet/oom_watcher.go index bc38cbf66b3..bd0b54d2a29 100644 --- a/pkg/kubelet/oom_watcher.go +++ b/pkg/kubelet/oom_watcher.go @@ -17,13 +17,13 @@ limitations under the License. package kubelet import ( + "github.com/golang/glog" + "github.com/google/cadvisor/events" + cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" - "github.com/google/cadvisor/events" - cadvisorApi "github.com/google/cadvisor/info/v1" ) type OOMWatcher interface { diff --git a/pkg/kubelet/pod_manager.go b/pkg/kubelet/pod_manager.go index f959f368dc8..ee85c334fd4 100644 --- a/pkg/kubelet/pod_manager.go +++ b/pkg/kubelet/pod_manager.go @@ -19,11 +19,11 @@ package kubelet import ( "sync" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/types" - "github.com/golang/glog" ) // Pod manager stores and manages access to the pods. diff --git a/pkg/kubelet/pod_workers.go b/pkg/kubelet/pod_workers.go index 7b993e859d4..3282580f74f 100644 --- a/pkg/kubelet/pod_workers.go +++ b/pkg/kubelet/pod_workers.go @@ -20,12 +20,12 @@ import ( "sync" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) // PodWorkers is an abstract interface for testability. diff --git a/pkg/kubelet/pod_workers_test.go b/pkg/kubelet/pod_workers_test.go index 468c039ed82..cbb86e794ca 100644 --- a/pkg/kubelet/pod_workers_test.go +++ b/pkg/kubelet/pod_workers_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" + docker "github.com/fsouza/go-dockerclient" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/kubelet/network" "k8s.io/kubernetes/pkg/types" - docker "github.com/fsouza/go-dockerclient" ) func newPod(uid, name string) *api.Pod { diff --git a/pkg/kubelet/rkt/pod_info.go b/pkg/kubelet/rkt/pod_info.go index 2a15f31b54d..64a38cb5c03 100644 --- a/pkg/kubelet/rkt/pod_info.go +++ b/pkg/kubelet/rkt/pod_info.go @@ -21,10 +21,10 @@ import ( "strconv" "strings" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) // rkt pod state. diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index 482b03f1968..232b17a7b3e 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -30,6 +30,13 @@ import ( "syscall" "time" + appcschema "github.com/appc/spec/schema" + appctypes "github.com/appc/spec/schema/types" + "github.com/coreos/go-systemd/dbus" + "github.com/coreos/go-systemd/unit" + "github.com/docker/docker/pkg/parsers" + docker "github.com/fsouza/go-dockerclient" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/credentialprovider" @@ -38,13 +45,6 @@ import ( "k8s.io/kubernetes/pkg/probe" "k8s.io/kubernetes/pkg/securitycontext" "k8s.io/kubernetes/pkg/types" - appcschema "github.com/appc/spec/schema" - appctypes "github.com/appc/spec/schema/types" - "github.com/coreos/go-systemd/dbus" - "github.com/coreos/go-systemd/unit" - "github.com/docker/docker/pkg/parsers" - docker "github.com/fsouza/go-dockerclient" - "github.com/golang/glog" ) const ( diff --git a/pkg/kubelet/runonce.go b/pkg/kubelet/runonce.go index 5b4e904b6b6..e73a636b36c 100644 --- a/pkg/kubelet/runonce.go +++ b/pkg/kubelet/runonce.go @@ -20,10 +20,10 @@ import ( "fmt" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/kubelet/container" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "github.com/golang/glog" ) const ( diff --git a/pkg/kubelet/runonce_test.go b/pkg/kubelet/runonce_test.go index cf8534aa671..89b311b85d7 100644 --- a/pkg/kubelet/runonce_test.go +++ b/pkg/kubelet/runonce_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" + docker "github.com/fsouza/go-dockerclient" + cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/kubelet/network" - docker "github.com/fsouza/go-dockerclient" - cadvisorApi "github.com/google/cadvisor/info/v1" ) type listContainersResult struct { diff --git a/pkg/kubelet/runtime_hooks.go b/pkg/kubelet/runtime_hooks.go index 59c7be9b3f4..ce36067bea2 100644 --- a/pkg/kubelet/runtime_hooks.go +++ b/pkg/kubelet/runtime_hooks.go @@ -17,10 +17,10 @@ limitations under the License. package kubelet import ( + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "github.com/golang/glog" ) // Kubelet-specific runtime hooks. diff --git a/pkg/kubelet/server.go b/pkg/kubelet/server.go index 7cdfd89a867..88c526bcb04 100644 --- a/pkg/kubelet/server.go +++ b/pkg/kubelet/server.go @@ -32,6 +32,9 @@ import ( "sync" "time" + "github.com/golang/glog" + cadvisorApi "github.com/google/cadvisor/info/v1" + "github.com/prometheus/client_golang/prometheus" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/healthz" @@ -41,9 +44,6 @@ import ( "k8s.io/kubernetes/pkg/util/flushwriter" "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream/spdy" - "github.com/golang/glog" - cadvisorApi "github.com/google/cadvisor/info/v1" - "github.com/prometheus/client_golang/prometheus" ) // Server is a http.Handler which exposes kubelet functionality over HTTP. diff --git a/pkg/kubelet/server_test.go b/pkg/kubelet/server_test.go index f1068f5d892..0c18e23e3b8 100644 --- a/pkg/kubelet/server_test.go +++ b/pkg/kubelet/server_test.go @@ -32,13 +32,13 @@ import ( "testing" "time" + cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream/spdy" - cadvisorApi "github.com/google/cadvisor/info/v1" ) type fakeKubelet struct { diff --git a/pkg/kubelet/status_manager.go b/pkg/kubelet/status_manager.go index 6f9d8513e60..9f7f45e1b0d 100644 --- a/pkg/kubelet/status_manager.go +++ b/pkg/kubelet/status_manager.go @@ -22,13 +22,13 @@ import ( "sort" "sync" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" kubeletUtil "k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) type podStatusSyncRequest struct { diff --git a/pkg/kubelet/util.go b/pkg/kubelet/util.go index 77bb4c6aeb3..9b5b8be96c6 100644 --- a/pkg/kubelet/util.go +++ b/pkg/kubelet/util.go @@ -19,11 +19,11 @@ package kubelet import ( "fmt" + cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/securitycontext" - cadvisorApi "github.com/google/cadvisor/info/v1" ) func CapacityFromMachineInfo(info *cadvisorApi.MachineInfo) api.ResourceList { diff --git a/pkg/kubelet/volumes.go b/pkg/kubelet/volumes.go index 78421d5ab19..0bbe6134d4a 100644 --- a/pkg/kubelet/volumes.go +++ b/pkg/kubelet/volumes.go @@ -21,6 +21,8 @@ import ( "io/ioutil" "path" + "github.com/davecgh/go-spew/spew" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -28,8 +30,6 @@ import ( "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" - "github.com/davecgh/go-spew/spew" - "github.com/golang/glog" ) var errUnsupportedVolumeType = fmt.Errorf("unsupported volume type") diff --git a/pkg/master/master.go b/pkg/master/master.go index d4864803547..871f3fdb2f7 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -77,12 +77,12 @@ import ( "k8s.io/kubernetes/pkg/ui" "k8s.io/kubernetes/pkg/util" - "k8s.io/kubernetes/pkg/registry/service/allocator" - "k8s.io/kubernetes/pkg/registry/service/portallocator" "github.com/emicklei/go-restful" "github.com/emicklei/go-restful/swagger" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" + "k8s.io/kubernetes/pkg/registry/service/allocator" + "k8s.io/kubernetes/pkg/registry/service/portallocator" ) const ( diff --git a/pkg/proxy/config/config.go b/pkg/proxy/config/config.go index 58dbc343e82..38925ae26bc 100644 --- a/pkg/proxy/config/config.go +++ b/pkg/proxy/config/config.go @@ -19,10 +19,10 @@ package config import ( "sync" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/config" - "github.com/golang/glog" ) // Operation is a type of operation of services or endpoints. diff --git a/pkg/proxy/proxier.go b/pkg/proxy/proxier.go index 81c4065ba06..ca8c0b9ea35 100644 --- a/pkg/proxy/proxier.go +++ b/pkg/proxy/proxier.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/util/iptables" - "github.com/golang/glog" ) type portal struct { diff --git a/pkg/proxy/proxysocket.go b/pkg/proxy/proxysocket.go index eecd5f055ea..ab94b8e69a9 100644 --- a/pkg/proxy/proxysocket.go +++ b/pkg/proxy/proxysocket.go @@ -25,9 +25,9 @@ import ( "sync" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) // Abstraction over TCP/UDP sockets which are proxied. diff --git a/pkg/proxy/roundrobin.go b/pkg/proxy/roundrobin.go index 714f4b815f2..82ba34e5c21 100644 --- a/pkg/proxy/roundrobin.go +++ b/pkg/proxy/roundrobin.go @@ -25,10 +25,10 @@ import ( "sync" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/slice" - "github.com/golang/glog" ) var ( diff --git a/pkg/registry/controller/etcd/etcd_test.go b/pkg/registry/controller/etcd/etcd_test.go index 5a740c5dcde..03f595c8d10 100644 --- a/pkg/registry/controller/etcd/etcd_test.go +++ b/pkg/registry/controller/etcd/etcd_test.go @@ -22,6 +22,7 @@ import ( "testing" "time" + "github.com/coreos/go-etcd/etcd" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/latest" @@ -34,7 +35,6 @@ import ( etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" "k8s.io/kubernetes/pkg/tools" "k8s.io/kubernetes/pkg/tools/etcdtest" - "github.com/coreos/go-etcd/etcd" ) const ( diff --git a/pkg/registry/generic/rest/proxy.go b/pkg/registry/generic/rest/proxy.go index 1ccaa2322bf..8c99cee7a87 100644 --- a/pkg/registry/generic/rest/proxy.go +++ b/pkg/registry/generic/rest/proxy.go @@ -32,9 +32,9 @@ import ( "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/proxy" - "k8s.io/kubernetes/third_party/golang/netutil" "github.com/golang/glog" "github.com/mxk/go-flowrate/flowrate" + "k8s.io/kubernetes/third_party/golang/netutil" ) // UpgradeAwareProxyHandler is a handler for proxy requests that may require an upgrade diff --git a/pkg/registry/service/rest.go b/pkg/registry/service/rest.go index 13106384f76..bd3871d3692 100644 --- a/pkg/registry/service/rest.go +++ b/pkg/registry/service/rest.go @@ -24,6 +24,7 @@ import ( "net/url" "strconv" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" @@ -38,7 +39,6 @@ import ( "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/fielderrors" "k8s.io/kubernetes/pkg/watch" - "github.com/golang/glog" ) // REST adapts a service registry into apiserver's RESTStorage model. diff --git a/pkg/storage/etcd/etcd_helper.go b/pkg/storage/etcd/etcd_helper.go index 19b453bb65b..54e32e23fab 100644 --- a/pkg/storage/etcd/etcd_helper.go +++ b/pkg/storage/etcd/etcd_helper.go @@ -24,6 +24,7 @@ import ( "strings" "time" + "github.com/coreos/go-etcd/etcd" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" @@ -32,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/tools/metrics" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" - "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" ) diff --git a/pkg/storage/etcd/etcd_helper_test.go b/pkg/storage/etcd/etcd_helper_test.go index ff634d6facc..4cb6ef73d3a 100644 --- a/pkg/storage/etcd/etcd_helper_test.go +++ b/pkg/storage/etcd/etcd_helper_test.go @@ -30,6 +30,8 @@ import ( "testing" "time" + "github.com/coreos/go-etcd/etcd" + "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/conversion" @@ -37,8 +39,6 @@ import ( "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/tools" "k8s.io/kubernetes/pkg/tools/etcdtest" - "github.com/coreos/go-etcd/etcd" - "github.com/stretchr/testify/assert" ) const validEtcdVersion = "etcd 2.0.9" diff --git a/pkg/storage/etcd/etcd_watcher_test.go b/pkg/storage/etcd/etcd_watcher_test.go index 9f812f7d57a..43e630df18b 100644 --- a/pkg/storage/etcd/etcd_watcher_test.go +++ b/pkg/storage/etcd/etcd_watcher_test.go @@ -21,6 +21,7 @@ import ( "testing" "time" + "github.com/coreos/go-etcd/etcd" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/runtime" @@ -28,7 +29,6 @@ import ( "k8s.io/kubernetes/pkg/tools" "k8s.io/kubernetes/pkg/tools/etcdtest" "k8s.io/kubernetes/pkg/watch" - "github.com/coreos/go-etcd/etcd" ) var versioner = APIObjectVersioner{} diff --git a/pkg/util/httpstream/spdy/connection.go b/pkg/util/httpstream/spdy/connection.go index 24665235f55..7c2227917d8 100644 --- a/pkg/util/httpstream/spdy/connection.go +++ b/pkg/util/httpstream/spdy/connection.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/util/httpstream" "github.com/docker/spdystream" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util/httpstream" ) // connection maintains state about a spdystream.Connection and its associated diff --git a/pkg/util/httpstream/spdy/upgrade.go b/pkg/util/httpstream/spdy/upgrade.go index a2e223132f1..70c90c8f499 100644 --- a/pkg/util/httpstream/spdy/upgrade.go +++ b/pkg/util/httpstream/spdy/upgrade.go @@ -21,8 +21,8 @@ import ( "net/http" "strings" - "k8s.io/kubernetes/pkg/util/httpstream" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util/httpstream" ) const HeaderSpdy31 = "SPDY/3.1" diff --git a/pkg/util/iptables/iptables.go b/pkg/util/iptables/iptables.go index 2f3996f2e24..1995fc19d3f 100644 --- a/pkg/util/iptables/iptables.go +++ b/pkg/util/iptables/iptables.go @@ -23,9 +23,9 @@ import ( "strings" "sync" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/util" utilexec "k8s.io/kubernetes/pkg/util/exec" - "github.com/golang/glog" ) type RulePosition string diff --git a/pkg/util/mount/nsenter_mount.go b/pkg/util/mount/nsenter_mount.go index cfada0a30f6..59efdae3ad7 100644 --- a/pkg/util/mount/nsenter_mount.go +++ b/pkg/util/mount/nsenter_mount.go @@ -23,8 +23,8 @@ import ( "path/filepath" "strings" - "k8s.io/kubernetes/pkg/util/exec" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util/exec" ) // NsenterMounter is part of experimental support for running the kubelet diff --git a/pkg/util/node/node.go b/pkg/util/node/node.go index 0245e868c15..cbc062fc970 100644 --- a/pkg/util/node/node.go +++ b/pkg/util/node/node.go @@ -22,8 +22,8 @@ import ( "os/exec" "strings" - "k8s.io/kubernetes/pkg/api" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/api" ) func GetHostname(hostnameOverride string) string { diff --git a/pkg/util/uuid.go b/pkg/util/uuid.go index c8ad861fd8e..bc7326d5824 100644 --- a/pkg/util/uuid.go +++ b/pkg/util/uuid.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/types" "github.com/pborman/uuid" + "k8s.io/kubernetes/pkg/types" ) var uuidLock sync.Mutex diff --git a/pkg/version/verflag/verflag.go b/pkg/version/verflag/verflag.go index e4b72a12609..7e66b5fbe4e 100644 --- a/pkg/version/verflag/verflag.go +++ b/pkg/version/verflag/verflag.go @@ -23,8 +23,8 @@ import ( "os" "strconv" - "k8s.io/kubernetes/pkg/version" flag "github.com/spf13/pflag" + "k8s.io/kubernetes/pkg/version" ) type versionValue int diff --git a/pkg/volume/aws_ebs/aws_ebs.go b/pkg/volume/aws_ebs/aws_ebs.go index f6148e94b50..b12d976633c 100644 --- a/pkg/volume/aws_ebs/aws_ebs.go +++ b/pkg/volume/aws_ebs/aws_ebs.go @@ -24,6 +24,7 @@ import ( "strconv" "strings" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider/aws" @@ -32,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" - "github.com/golang/glog" ) // This is the primary entrypoint for volume plugins. diff --git a/pkg/volume/aws_ebs/aws_util.go b/pkg/volume/aws_ebs/aws_util.go index d5dd96b7e66..a0b738f9161 100644 --- a/pkg/volume/aws_ebs/aws_util.go +++ b/pkg/volume/aws_ebs/aws_util.go @@ -22,9 +22,9 @@ import ( "os" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" - "github.com/golang/glog" ) type AWSDiskUtil struct{} diff --git a/pkg/volume/empty_dir/empty_dir.go b/pkg/volume/empty_dir/empty_dir.go index f8a3730ae46..be063b3025a 100644 --- a/pkg/volume/empty_dir/empty_dir.go +++ b/pkg/volume/empty_dir/empty_dir.go @@ -21,13 +21,13 @@ import ( "os" "path" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" - "github.com/golang/glog" ) // TODO: in the near future, this will be changed to be more restrictive diff --git a/pkg/volume/empty_dir/empty_dir_linux.go b/pkg/volume/empty_dir/empty_dir_linux.go index 95ed9e9754f..5d6a0f27d38 100644 --- a/pkg/volume/empty_dir/empty_dir_linux.go +++ b/pkg/volume/empty_dir/empty_dir_linux.go @@ -22,9 +22,9 @@ import ( "fmt" "syscall" - "k8s.io/kubernetes/pkg/util/mount" "github.com/docker/libcontainer/selinux" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util/mount" ) // Defined by Linux - the type number for tmpfs mounts. diff --git a/pkg/volume/gce_pd/gce_pd.go b/pkg/volume/gce_pd/gce_pd.go index 3fea93c84e0..4b4ae042eb8 100644 --- a/pkg/volume/gce_pd/gce_pd.go +++ b/pkg/volume/gce_pd/gce_pd.go @@ -21,13 +21,13 @@ import ( "path" "strconv" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" - "github.com/golang/glog" ) // This is the primary entrypoint for volume plugins. diff --git a/pkg/volume/gce_pd/gce_util.go b/pkg/volume/gce_pd/gce_util.go index aad712d47f9..fde1ae31b68 100644 --- a/pkg/volume/gce_pd/gce_util.go +++ b/pkg/volume/gce_pd/gce_util.go @@ -24,13 +24,13 @@ import ( "strings" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider/gce" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/operationmanager" - "github.com/golang/glog" ) const ( diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index 8151334f16d..b689266afa5 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -20,13 +20,13 @@ import ( "math/rand" "os" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" - "github.com/golang/glog" ) // This is the primary entrypoint for volume plugins. diff --git a/pkg/volume/iscsi/disk_manager.go b/pkg/volume/iscsi/disk_manager.go index 17a073fec11..4d3b6eb8925 100644 --- a/pkg/volume/iscsi/disk_manager.go +++ b/pkg/volume/iscsi/disk_manager.go @@ -19,8 +19,8 @@ package iscsi import ( "os" - "k8s.io/kubernetes/pkg/util/mount" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util/mount" ) // Abstract interface to disk operations. diff --git a/pkg/volume/iscsi/iscsi.go b/pkg/volume/iscsi/iscsi.go index e7ba0697ba1..6327f039557 100644 --- a/pkg/volume/iscsi/iscsi.go +++ b/pkg/volume/iscsi/iscsi.go @@ -19,13 +19,13 @@ package iscsi import ( "strconv" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" - "github.com/golang/glog" ) // This is the primary entrypoint for volume plugins. diff --git a/pkg/volume/iscsi/iscsi_util.go b/pkg/volume/iscsi/iscsi_util.go index fdc4125122a..fc58061db51 100644 --- a/pkg/volume/iscsi/iscsi_util.go +++ b/pkg/volume/iscsi/iscsi_util.go @@ -23,9 +23,9 @@ import ( "strings" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" - "github.com/golang/glog" ) // stat a path, if not exists, retry maxRetries times diff --git a/pkg/volume/persistent_claim/persistent_claim.go b/pkg/volume/persistent_claim/persistent_claim.go index 116f86674e9..16c2f86dfac 100644 --- a/pkg/volume/persistent_claim/persistent_claim.go +++ b/pkg/volume/persistent_claim/persistent_claim.go @@ -18,11 +18,11 @@ package persistent_claim import ( "fmt" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" - "github.com/golang/glog" ) func ProbeVolumePlugins() []volume.VolumePlugin { diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index c837f641cd6..0f1431f0ffb 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -21,13 +21,13 @@ import ( "strings" "sync" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/util/mount" - "github.com/golang/glog" ) // VolumeOptions contains option information about a volume. diff --git a/pkg/volume/rbd/disk_manager.go b/pkg/volume/rbd/disk_manager.go index 30cbd2a7b79..0077d488e0b 100644 --- a/pkg/volume/rbd/disk_manager.go +++ b/pkg/volume/rbd/disk_manager.go @@ -25,8 +25,8 @@ package rbd import ( "os" - "k8s.io/kubernetes/pkg/util/mount" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util/mount" ) // Abstract interface to disk operations. diff --git a/pkg/volume/rbd/rbd.go b/pkg/volume/rbd/rbd.go index 7f3ae1c198c..4d446feaf8a 100644 --- a/pkg/volume/rbd/rbd.go +++ b/pkg/volume/rbd/rbd.go @@ -19,13 +19,13 @@ package rbd import ( "fmt" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" - "github.com/golang/glog" ) // This is the primary entrypoint for volume plugins. diff --git a/pkg/volume/rbd/rbd_util.go b/pkg/volume/rbd/rbd_util.go index bbafe8e947e..dffbfcd0aea 100644 --- a/pkg/volume/rbd/rbd_util.go +++ b/pkg/volume/rbd/rbd_util.go @@ -31,10 +31,10 @@ import ( "strings" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/volume" - "github.com/golang/glog" ) // stat a path, if not exists, retry maxRetries times diff --git a/pkg/volume/secret/secret.go b/pkg/volume/secret/secret.go index 28feb8da23f..1651d66993c 100644 --- a/pkg/volume/secret/secret.go +++ b/pkg/volume/secret/secret.go @@ -22,13 +22,13 @@ import ( "os" "path" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" - "github.com/golang/glog" ) // ProbeVolumePlugin is the entry point for plugin detection in a package. diff --git a/pkg/volumeclaimbinder/persistent_volume_recycler.go b/pkg/volumeclaimbinder/persistent_volume_recycler.go index 0a28ae16c18..4bedf562f5a 100644 --- a/pkg/volumeclaimbinder/persistent_volume_recycler.go +++ b/pkg/volumeclaimbinder/persistent_volume_recycler.go @@ -30,9 +30,9 @@ import ( "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/watch" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/mount" - "github.com/golang/glog" ) // PersistentVolumeRecycler is a controller that watches for PersistentVolumes that are released from their claims. diff --git a/pkg/watch/iowatcher.go b/pkg/watch/iowatcher.go index dc49f1214a9..6003d088600 100644 --- a/pkg/watch/iowatcher.go +++ b/pkg/watch/iowatcher.go @@ -20,9 +20,9 @@ import ( "io" "sync" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) // Decoder allows StreamWatcher to watch any stream for which a Decoder can be written. diff --git a/plugin/pkg/scheduler/algorithm/priorities/priorities.go b/plugin/pkg/scheduler/algorithm/priorities/priorities.go index 9a5399509d8..58c61055146 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/priorities.go +++ b/plugin/pkg/scheduler/algorithm/priorities/priorities.go @@ -19,12 +19,12 @@ package priorities import ( "math" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "github.com/golang/glog" ) // the unused capacity is calculated on a scale of 0-10 diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go index d1da9ec7898..11f5f943598 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go @@ -17,10 +17,10 @@ limitations under the License. package priorities import ( + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" - "github.com/golang/glog" ) type SelectorSpread struct { diff --git a/plugin/pkg/scheduler/generic_scheduler.go b/plugin/pkg/scheduler/generic_scheduler.go index 8cf5e61b939..cf0eb213d26 100644 --- a/plugin/pkg/scheduler/generic_scheduler.go +++ b/plugin/pkg/scheduler/generic_scheduler.go @@ -23,11 +23,11 @@ import ( "strings" "sync" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "github.com/golang/glog" ) type FailedPredicateMap map[string]util.StringSet diff --git a/test/e2e/addon_update.go b/test/e2e/addon_update.go index 2000f4d6fc0..618a245dd1e 100644 --- a/test/e2e/addon_update.go +++ b/test/e2e/addon_update.go @@ -24,9 +24,9 @@ import ( "strings" "time" + "golang.org/x/crypto/ssh" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" - "golang.org/x/crypto/ssh" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 4d397d98c7b..5df68566196 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/clientcmd" - "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" "github.com/onsi/ginkgo" "github.com/onsi/ginkgo/config" "github.com/onsi/ginkgo/reporters" "github.com/onsi/gomega" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientcmd" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/util" ) const ( diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go index dbb95b26b3e..014265ad5d4 100644 --- a/test/e2e/kubelet_stats.go +++ b/test/e2e/kubelet_stats.go @@ -28,6 +28,7 @@ import ( "text/tabwriter" "time" + cadvisor "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/fields" @@ -36,7 +37,6 @@ import ( "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/util" - cadvisor "github.com/google/cadvisor/info/v1" "github.com/prometheus/client_golang/extraction" "github.com/prometheus/client_golang/model" diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index 09286a286ce..694e02bc3de 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -22,11 +22,11 @@ import ( "net/url" "time" + influxdb "github.com/influxdb/influxdb/client" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" - influxdb "github.com/influxdb/influxdb/client" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e/pd.go b/test/e2e/pd.go index dcccaedd308..dc28233e725 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -23,6 +23,8 @@ import ( "strings" "time" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/resource" @@ -31,8 +33,6 @@ import ( "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" ) const ( diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 11f176c2d10..4514669f458 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -19,12 +19,12 @@ package e2e import ( "fmt" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/client" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" "time" ) diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 5489f6c22c4..75408561f9e 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -30,9 +30,9 @@ import ( "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/wait" - "k8s.io/kubernetes/pkg/cloudprovider/aws" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "k8s.io/kubernetes/pkg/cloudprovider/aws" ) const serveHostnameImage = "gcr.io/google_containers/serve_hostname:1.1" diff --git a/test/e2e/service.go b/test/e2e/service.go index 9e81222b069..88aafac580e 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -25,6 +25,8 @@ import ( "strings" "time" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client" @@ -32,8 +34,6 @@ import ( "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/wait" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" ) // This should match whatever the default/configured range is diff --git a/test/integration/framework/etcd_utils.go b/test/integration/framework/etcd_utils.go index 1cdb763074a..921567f1578 100644 --- a/test/integration/framework/etcd_utils.go +++ b/test/integration/framework/etcd_utils.go @@ -22,13 +22,13 @@ import ( "fmt" "math/rand" + "github.com/coreos/go-etcd/etcd" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/tools/etcdtest" - "github.com/coreos/go-etcd/etcd" - "github.com/golang/glog" ) // If you need to start an etcd instance by hand, you also need to insert a key diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 48c12acdb63..a0b7e024ba4 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -25,6 +25,7 @@ import ( "testing" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/testapi" @@ -40,7 +41,6 @@ import ( "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/tools/etcdtest" "k8s.io/kubernetes/plugin/pkg/admission/admit" - "github.com/golang/glog" ) const ( diff --git a/test/integration/master_benchmark_test.go b/test/integration/master_benchmark_test.go index 26dbdbe2152..8531a7148fc 100644 --- a/test/integration/master_benchmark_test.go +++ b/test/integration/master_benchmark_test.go @@ -25,6 +25,7 @@ import ( "testing" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/fields" @@ -32,7 +33,6 @@ import ( etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" "k8s.io/kubernetes/pkg/tools/etcdtest" "k8s.io/kubernetes/test/integration/framework" - "github.com/golang/glog" ) // Command line flag globals, parsed in init and used by the benchmarks: diff --git a/test/soak/cauldron/cauldron.go b/test/soak/cauldron/cauldron.go index 2ee86810ff1..fe0aee36a97 100644 --- a/test/soak/cauldron/cauldron.go +++ b/test/soak/cauldron/cauldron.go @@ -29,12 +29,12 @@ import ( "net/http" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) var ( diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index 8dafb528971..e6b945d19d6 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -29,13 +29,13 @@ import ( "path/filepath" "time" + "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client" "k8s.io/kubernetes/pkg/client/clientcmd" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" - "github.com/golang/glog" ) var (