run gofmt on everything we touched

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 {