run gofmt on everything we touched

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

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

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 (

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

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 (

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 (

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 (

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

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 (

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 (

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 (

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 (

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 (

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 (

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"

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

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

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 (

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