rewrite go imports

pkg/util/config/config.go

@@ -19,7 +19,7 @@ package config
 import (
 	"sync"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/util"
 )
 
 type Merger interface {

pkg/util/fielderrors/fielderrors.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors"
+	"k8s.io/kubernetes/pkg/util/errors"
 
 	"github.com/davecgh/go-spew/spew"
 	"github.com/golang/glog"

pkg/util/httpstream/spdy/connection.go

@@ -22,7 +22,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream"
+	"k8s.io/kubernetes/pkg/util/httpstream"
 	"github.com/docker/spdystream"
 	"github.com/golang/glog"
 )

pkg/util/httpstream/spdy/roundtripper.go

@@ -25,10 +25,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream"
-	"github.com/GoogleCloudPlatform/kubernetes/third_party/golang/netutil"
+	"k8s.io/kubernetes/pkg/api"
+	apierrors "k8s.io/kubernetes/pkg/api/errors"
+	"k8s.io/kubernetes/pkg/util/httpstream"
+	"k8s.io/kubernetes/third_party/golang/netutil"
 )
 
 // SpdyRoundTripper knows how to upgrade an HTTP request to one that supports

pkg/util/httpstream/spdy/roundtripper_test.go

@@ -32,7 +32,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream"
+	"k8s.io/kubernetes/pkg/util/httpstream"
 )
 
 func TestRoundTripAndNewConnection(t *testing.T) {

pkg/util/httpstream/spdy/upgrade.go

@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream"
+	"k8s.io/kubernetes/pkg/util/httpstream"
 	"github.com/golang/glog"
 )
 

pkg/util/iptables/iptables.go

@@ -23,8 +23,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	utilexec "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec"
+	"k8s.io/kubernetes/pkg/util"
+	utilexec "k8s.io/kubernetes/pkg/util/exec"
 	"github.com/golang/glog"
 )
 

pkg/util/iptables/iptables_test.go

@@ -19,8 +19,8 @@ package iptables
 import (
 	"testing"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec"
+	"k8s.io/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/util/exec"
 )
 
 func getIptablesCommand(protocol Protocol) string {

pkg/util/jsonpath/jsonpath.go

@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/GoogleCloudPlatform/kubernetes/third_party/golang/template"
+	"k8s.io/kubernetes/third_party/golang/template"
 )
 
 type JSONPath struct {

pkg/util/mount/nsenter_mount.go

@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec"
+	"k8s.io/kubernetes/pkg/util/exec"
 	"github.com/golang/glog"
 )
 

pkg/util/node/node.go

@@ -22,7 +22,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api"
 	"github.com/golang/glog"
 )
 

pkg/util/proxy/transport.go

@@ -31,7 +31,7 @@ import (
 	"golang.org/x/net/html"
 	"golang.org/x/net/html/atom"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/util"
 )
 
 // atomsToAttrs states which attributes of which tags require URL substitution.

pkg/util/strategicpatch/patch.go

@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"sort"
 
-	forkedjson "github.com/GoogleCloudPlatform/kubernetes/third_party/forked/json"
+	forkedjson "k8s.io/kubernetes/third_party/forked/json"
 )
 
 // An alternate implementation of JSON Merge Patch

pkg/util/uuid.go

@@ -20,7 +20,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
+	"k8s.io/kubernetes/pkg/types"
 	"github.com/pborman/uuid"
 )
 

pkg/util/workqueue/queue_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/workqueue"
+	"k8s.io/kubernetes/pkg/util/workqueue"
 )
 
 func TestBasic(t *testing.T) {