run gofmt on everything we touched

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 {

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.

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]*)`)

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.

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

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 (

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.

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 {

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

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

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 (

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

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.

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 {

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 (

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 {

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.

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

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

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

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 {

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 (

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.

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 {

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"

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 {

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.

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.

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 {

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.

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 (

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 (

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 {

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.

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.

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 {

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 {

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 {

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