rewrite go imports

2015-08-05 15:03:47 -07:00
parent 9a3fb3cb1f
commit 8e33cbfa28
844 changed files with 3659 additions and 3659 deletions
--- a/pkg/api/context.go
+++ b/pkg/api/context.go
@@ -19,7 +19,7 @@ package api
 import (
 	stderrs "errors"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user"
+	"k8s.io/kubernetes/pkg/auth/user"
 	"golang.org/x/net/context"
 )

--- a/pkg/api/context_test.go
+++ b/pkg/api/context_test.go
@@ -19,7 +19,7 @@ package api_test
 import (
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api"
 )

 // TestNamespaceContext validates that a namespace can be get/set on a context object
--- a/pkg/api/conversion.go
+++ b/pkg/api/conversion.go
@@ -17,12 +17,12 @@ limitations under the License.
 package api

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/conversion"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util"
 )

 // Codec is the identity codec for this package - it can only convert itself
--- a/pkg/api/conversion_test.go
+++ b/pkg/api/conversion_test.go
@@ -20,8 +20,8 @@ import (
 	"io/ioutil"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/testapi"
 )

 func BenchmarkPodConversion(b *testing.B) {
--- a/pkg/api/copy_test.go
+++ b/pkg/api/copy_test.go
@@ -21,9 +21,9 @@ import (
 	"reflect"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
-	apitesting "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testing"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/testapi"
+	apitesting "k8s.io/kubernetes/pkg/api/testing"
 )

 func TestDeepCopyApiObjects(t *testing.T) {
--- a/pkg/api/deep_copy_generated.go
+++ b/pkg/api/deep_copy_generated.go
@@ -18,12 +18,12 @@ package api

 // AUTO-GENERATED FUNCTIONS START HERE
 import (
-	resource "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	conversion "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
-	fields "github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
-	labels "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
-	runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	util "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	resource "k8s.io/kubernetes/pkg/api/resource"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+	fields "k8s.io/kubernetes/pkg/fields"
+	labels "k8s.io/kubernetes/pkg/labels"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+	util "k8s.io/kubernetes/pkg/util"
 	inf "speter.net/go/exp/math/dec/inf"
 	time "time"
 )
--- a/pkg/api/deep_copy_test.go
+++ b/pkg/api/deep_copy_test.go
@@ -20,7 +20,7 @@ import (
 	"io/ioutil"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api"
 )

 func BenchmarkPodCopy(b *testing.B) {
--- a/pkg/api/endpoints/util.go
+++ b/pkg/api/endpoints/util.go
@@ -23,8 +23,8 @@ import (
 	"hash"
 	"sort"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/util"
 )

 // RepackSubsets takes a slice of EndpointSubset objects, expands it to the full
--- a/pkg/api/endpoints/util_test.go
+++ b/pkg/api/endpoints/util_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api"
 	"github.com/davecgh/go-spew/spew"
 )

--- a/pkg/api/errors/errors.go
+++ b/pkg/api/errors/errors.go
@@ -22,10 +22,10 @@ import (
 	"net/http"
 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/errors"
+	"k8s.io/kubernetes/pkg/util/fielderrors"
 )

 // HTTP Status codes not in the golang http package.
--- a/pkg/api/errors/errors_test.go
+++ b/pkg/api/errors/errors_test.go
@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/fielderrors"
 )

 func TestErrorNew(t *testing.T) {
--- a/pkg/api/errors/etcd/etcd.go
+++ b/pkg/api/errors/etcd/etcd.go
@@ -17,8 +17,8 @@ limitations under the License.
 package etcd

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
-	etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd"
+	"k8s.io/kubernetes/pkg/api/errors"
+	etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
 )

 // InterpretGetError converts a generic etcd error on a retrieval
--- a/pkg/api/generate.go
+++ b/pkg/api/generate.go
@@ -19,7 +19,7 @@ package api
 import (
 	"fmt"

-	utilrand "github.com/GoogleCloudPlatform/kubernetes/pkg/util/rand"
+	utilrand "k8s.io/kubernetes/pkg/util/rand"
 )

 // NameGenerator generates names for objects. Some backends may have more information
--- a/pkg/api/helpers.go
+++ b/pkg/api/helpers.go
@@ -21,12 +21,12 @@ import (
 	"fmt"
 	"reflect"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/conversion"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util"

 	"github.com/davecgh/go-spew/spew"
 )
--- a/pkg/api/helpers_test.go
+++ b/pkg/api/helpers_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/api/resource"

 	"speter.net/go/exp/math/dec/inf"
 )
--- a/pkg/api/latest/latest.go
+++ b/pkg/api/latest/latest.go
@@ -20,12 +20,12 @@ import (
 	"fmt"
 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/meta"
+	"k8s.io/kubernetes/pkg/api/registered"
+	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util"
 )

 // Version is the string that represents the current external default version.
@@ -63,7 +63,7 @@ var RESTMapper meta.RESTMapper
 // userResources is a group of resources mostly used by a kubectl user
 var userResources = []string{"rc", "svc", "pods", "pvc"}

-const importPrefix = "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+const importPrefix = "k8s.io/kubernetes/pkg/api"

 func init() {
 	// Use the first API version in the list of registered versions as the latest.
--- a/pkg/api/latest/latest_test.go
+++ b/pkg/api/latest/latest_test.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"testing"

-	internal "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	internal "k8s.io/kubernetes/pkg/api"
 )

 func TestResourceVersioner(t *testing.T) {
--- a/pkg/api/mapper.go
+++ b/pkg/api/mapper.go
@@ -19,8 +19,8 @@ package api
 import (
 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api/meta"
+	"k8s.io/kubernetes/pkg/util"
 )

 var RESTMapper meta.RESTMapper
--- a/pkg/api/meta.go
+++ b/pkg/api/meta.go
@@ -17,9 +17,9 @@ limitations under the License.
 package api

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/conversion"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util"
 )

 // FillObjectMetaSystemFields populates fields that are managed by the system on ObjectMeta.
--- a/pkg/api/meta/interfaces.go
+++ b/pkg/api/meta/interfaces.go
@@ -17,8 +17,8 @@ limitations under the License.
 package meta

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/types"
 )

 // VersionInterfaces contains the interfaces one should use for dealing with types of a particular version.
--- a/pkg/api/meta/meta.go
+++ b/pkg/api/meta/meta.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"reflect"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
+	"k8s.io/kubernetes/pkg/conversion"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/types"
 )

 // Accessor takes an arbitrary object pointer and returns meta.Interface.
--- a/pkg/api/meta/meta_test.go
+++ b/pkg/api/meta/meta_test.go
@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util"
 )

 func TestGenericTypeMeta(t *testing.T) {
--- a/pkg/api/meta/restmapper_test.go
+++ b/pkg/api/meta/restmapper_test.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/runtime"
 )

 type fakeCodec struct{}
--- a/pkg/api/meta_test.go
+++ b/pkg/api/meta_test.go
@@ -19,7 +19,7 @@ package api_test
 import (
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api"
 )

 // TestFillObjectMetaSystemFields validates that system populated fields are set on an object
--- a/pkg/api/ref.go
+++ b/pkg/api/ref.go
@@ -22,8 +22,8 @@ import (
 	"net/url"
 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/api/meta"
+	"k8s.io/kubernetes/pkg/runtime"
 )

 var (
--- a/pkg/api/ref_test.go
+++ b/pkg/api/ref_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/runtime"
 )

 type FakeAPIObject struct{}
--- a/pkg/api/register.go
+++ b/pkg/api/register.go
@@ -17,7 +17,7 @@ limitations under the License.
 package api

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/runtime"
 )

 // Scheme is the default instance of runtime.Scheme to which types in the Kubernetes API are already registered.
--- a/pkg/api/resource/quantity_example_test.go
+++ b/pkg/api/resource/quantity_example_test.go
@@ -19,7 +19,7 @@ package resource_test
 import (
 	"fmt"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/api/resource"
 )

 func ExampleFormat() {
--- a/pkg/api/resource_helpers.go
+++ b/pkg/api/resource_helpers.go
@@ -17,7 +17,7 @@ limitations under the License.
 package api

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/api/resource"
 )

 // Returns string version of ResourceName.
--- a/pkg/api/resource_helpers_test.go
+++ b/pkg/api/resource_helpers_test.go
@@ -19,7 +19,7 @@ package api
 import (
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/api/resource"
 )

 func TestResourceHelpers(t *testing.T) {
--- a/pkg/api/rest/create.go
+++ b/pkg/api/rest/create.go
@@ -17,10 +17,10 @@ limitations under the License.
 package rest

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/errors"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/fielderrors"
 )

 // RESTCreateStrategy defines the minimum validation, accepted input, and
--- a/pkg/api/rest/create_test.go
+++ b/pkg/api/rest/create_test.go
@@ -19,8 +19,8 @@ package rest
 import (
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/errors"
 )

 func TestCheckGeneratedNameError(t *testing.T) {
--- a/pkg/api/rest/delete.go
+++ b/pkg/api/rest/delete.go
@@ -17,8 +17,8 @@ limitations under the License.
 package rest

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/runtime"
 )

 // RESTDeleteStrategy defines deletion behavior on an object that follows Kubernetes
--- a/pkg/api/rest/rest.go
+++ b/pkg/api/rest/rest.go
@@ -21,11 +21,11 @@ import (
 	"net/http"
 	"net/url"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/watch"
 )

 //TODO:
--- a/pkg/api/rest/resttest/resttest.go
+++ b/pkg/api/rest/resttest/resttest.go
@@ -20,12 +20,12 @@ import (
 	"strings"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"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"
 )

--- a/pkg/api/rest/types.go
+++ b/pkg/api/rest/types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package rest

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/validation"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/fielderrors"
 )

 // ObjectFunc is a function to act on a given object. An error may be returned
--- a/pkg/api/rest/update.go
+++ b/pkg/api/rest/update.go
@@ -17,10 +17,10 @@ limitations under the License.
 package rest

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/errors"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/fielderrors"
 )

 // RESTUpdateStrategy defines the minimum validation, accepted input, and
--- a/pkg/api/rest/update_test.go
+++ b/pkg/api/rest/update_test.go
@@ -19,9 +19,9 @@ package rest
 import (
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util"
 )

 func makeValidService() api.Service {
--- a/pkg/api/serialization_test.go
+++ b/pkg/api/serialization_test.go
@@ -23,13 +23,13 @@ import (
 	"reflect"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
-	apitesting "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testing"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/latest"
+	"k8s.io/kubernetes/pkg/api/meta"
+	"k8s.io/kubernetes/pkg/api/testapi"
+	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"
--- a/pkg/api/testapi/testapi.go
+++ b/pkg/api/testapi/testapi.go
@@ -22,9 +22,9 @@ import (
 	"os"
 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/api/latest"
+	"k8s.io/kubernetes/pkg/api/meta"
+	"k8s.io/kubernetes/pkg/runtime"
 )

 // Version returns the API version to test against, as set by the KUBE_API_VERSION env var.
--- a/pkg/api/testing/fuzzer.go
+++ b/pkg/api/testing/fuzzer.go
@@ -22,14 +22,14 @@ import (
 	"strconv"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/registered"
+	"k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
+	"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"
--- a/pkg/api/types.go
+++ b/pkg/api/types.go
@@ -17,12 +17,12 @@ limitations under the License.
 package api

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/types"
+	"k8s.io/kubernetes/pkg/util"
 )

 // Common string formats
--- a/pkg/api/v1/conversion.go
+++ b/pkg/api/v1/conversion.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"reflect"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/conversion"
 )

 func addConversionFuncs() {
--- a/pkg/api/v1/conversion_generated.go
+++ b/pkg/api/v1/conversion_generated.go
@@ -18,9 +18,9 @@ package v1

 // AUTO-GENERATED FUNCTIONS START HERE
 import (
-	api "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	resource "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	conversion "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
+	api "k8s.io/kubernetes/pkg/api"
+	resource "k8s.io/kubernetes/pkg/api/resource"
+	conversion "k8s.io/kubernetes/pkg/conversion"
 	reflect "reflect"
 )

--- a/pkg/api/v1/conversion_test.go
+++ b/pkg/api/v1/conversion_test.go
@@ -19,8 +19,8 @@ package v1_test
 import (
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	versioned "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
+	"k8s.io/kubernetes/pkg/api"
+	versioned "k8s.io/kubernetes/pkg/api/v1"
 )

 func TestNodeConversion(t *testing.T) {
--- a/pkg/api/v1/deep_copy_generated.go
+++ b/pkg/api/v1/deep_copy_generated.go
@@ -18,11 +18,11 @@ package v1

 // AUTO-GENERATED FUNCTIONS START HERE
 import (
-	api "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	resource "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	conversion "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
-	runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	util "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	api "k8s.io/kubernetes/pkg/api"
+	resource "k8s.io/kubernetes/pkg/api/resource"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+	util "k8s.io/kubernetes/pkg/util"
 	inf "speter.net/go/exp/math/dec/inf"
 	time "time"
 )
--- a/pkg/api/v1/defaults.go
+++ b/pkg/api/v1/defaults.go
@@ -19,8 +19,8 @@ package v1
 import (
 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/util"
 )

 func addDefaultingFuncs() {
--- a/pkg/api/v1/defaults_test.go
+++ b/pkg/api/v1/defaults_test.go
@@ -20,10 +20,10 @@ import (
 	"reflect"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	versioned "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api"
+	versioned "k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util"
 )

 func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
--- a/pkg/api/v1/register.go
+++ b/pkg/api/v1/register.go
@@ -17,9 +17,9 @@ limitations under the License.
 package v1

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/registered"
+	"k8s.io/kubernetes/pkg/runtime"
 )

 // Codec encodes internal objects to the v1 scheme
--- a/pkg/api/v1/types.go
+++ b/pkg/api/v1/types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/types"
+	"k8s.io/kubernetes/pkg/util"
 )

 // Common string formats
--- a/pkg/api/validation/events.go
+++ b/pkg/api/validation/events.go
@@ -17,9 +17,9 @@ limitations under the License.
 package validation

 import (
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	errs "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/util"
+	errs "k8s.io/kubernetes/pkg/util/fielderrors"
 )

 // ValidateEvent makes sure that the event makes sense.
--- a/pkg/api/validation/events_test.go
+++ b/pkg/api/validation/events_test.go
@@ -19,7 +19,7 @@ package validation
 import (
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api"
 )

 func TestValidateEvent(t *testing.T) {
--- a/pkg/api/validation/schema.go
+++ b/pkg/api/validation/schema.go
@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors"
-	errs "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml"
+	"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"
 )
--- a/pkg/api/validation/schema_test.go
+++ b/pkg/api/validation/schema_test.go
@@ -21,10 +21,10 @@ import (
 	"math/rand"
 	"testing"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
-	apitesting "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testing"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/testapi"
+	apitesting "k8s.io/kubernetes/pkg/api/testing"
+	"k8s.io/kubernetes/pkg/runtime"
 )

 func readPod(filename string) (string, error) {
--- a/pkg/api/validation/validation.go
+++ b/pkg/api/validation/validation.go
@@ -25,12 +25,12 @@ import (
 	"regexp"
 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	errs "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/capabilities"
+	"k8s.io/kubernetes/pkg/labels"
+	"k8s.io/kubernetes/pkg/util"
+	errs "k8s.io/kubernetes/pkg/util/fielderrors"

 	"github.com/golang/glog"
 )
--- a/pkg/api/validation/validation_test.go
+++ b/pkg/api/validation/validation_test.go
@@ -22,14 +22,14 @@ import (
 	"testing"
 	"time"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	utilerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
-	errors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/api/testapi"
+	"k8s.io/kubernetes/pkg/capabilities"
+	"k8s.io/kubernetes/pkg/util"
+	utilerrors "k8s.io/kubernetes/pkg/util/errors"
+	"k8s.io/kubernetes/pkg/util/fielderrors"
+	errors "k8s.io/kubernetes/pkg/util/fielderrors"
 )

 func expectPrefix(t *testing.T, prefix string, errs fielderrors.ValidationErrorList) {