@@ -87,7 +87,7 @@ To enable running the kubernetes unit tests:

 To run unit test for an individual kubernetes package:

-    $ TEST_KUBE=1 hack/test-go.sh Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/examples

+    $ TEST_KUBE=1 hack/test-go.sh Godeps/_workspace/src/k8s.io/kubernetes/examples

 To turn off or change the coverage mode, which is `-cover -covermode=atomic` by default, use:

@@ -190,7 +190,7 @@ Before you begin, make sure you have both [openshift/origin](https://github.com/

 ```

 $ go get github.com/openshift/origin

-$ go get github.com/GoogleCloudPlatform/kubernetes

+$ go get k8s.io/kubernetes

 ```

 Check out the version of Kubernetes you want to rebase as a branch or tag named `stable_proposed` in

@@ -198,7 +198,7 @@ Check out the version of Kubernetes you want to rebase as a branch or tag named

 if you are going to rebase the latest `master` of Kubernetes:

 ```

-$ cd $GOPATH/src/github.com/GoogleCloudPlatform/kubernetes

+$ cd $GOPATH/src/k8s.io/kubernetes

 $ git checkout master

 $ git pull

 $ git checkout -b stable_proposed

@@ -220,7 +220,7 @@ $ hack/copy-kube-artifacts.sh

 Read over the changes with `git status` and make sure it looks reasonable. Check specially the

 `Godeps/Godeps.json` file to make sure no dependency is unintentionally missing.

-Commit using the message `bump(github.com/GoogleCloudPlatform/kubernetes):<commit SHA>`, where

+Commit using the message `bump(k8s.io/kubernetes):<commit SHA>`, where

 `<commit SHA>` is the commit id for the Kubernetes version we are including in our Godeps. It can be

 found in our `Godeps/Godeps.json` in the declaration of any Kubernetes package.

@@ -234,7 +234,7 @@ from the Origin directory. Follow these steps:

 1. `$ cd $GOPATH/src/github.com/openshift/origin`

 2. `make clean ; godep restore` will restore the package versions specified in the `Godeps/Godeps.json`

 of Origin to your GOPATH.

-2. `$ cd $GOPATH/src/github.com/GoogleCloudPlatform/kubernetes`

+2. `$ cd $GOPATH/src/k8s.io/kubernetes`

 3. `$ git checkout stable_proposed` will checkout the desired version of Kubernetes as branched in

 *Preparation*.

 4. `$ godep restore` will restore the package versions specified in the `Godeps/Godeps.json`

@@ -249,7 +249,7 @@ again.

 8. Read over the changes with `git status` and make sure it looks reasonable. Check specially the

 `Godeps/Godeps.json` file to make sure no dependency is unintentionally missing. The whole Godeps

 directory will be added to version control, including `_workspace`.

-9. Commit using the message `bump(github.com/GoogleCloudPlatform/kubernetes):<commit SHA>`, where

+9. Commit using the message `bump(k8s.io/kubernetes):<commit SHA>`, where

 `<commit SHA>` is the commit id for the Kubernetes version we are including in our Godeps. It can be

 found in our `Godeps/Godeps.json` in the declaration of any Kubernetes package.

@@ -266,7 +266,7 @@ rebase, we need to make sure we get all these changes otherwise they will be ove

 1. Check the `Godeps` directory [commits history](https://github.com/openshift/origin/commits/master/Godeps)

 for commits tagged with the *UPSTREAM* keyword. We will need to cherry-pick *all UPSTREAM commits since

 the last Kubernetes rebase* (remember you can find the last rebase commit looking for a message like

-`bump(github.com/GoogleCloudPlatform/kubernetes):...`).

+`bump(k8s.io/kubernetes):...`).

 2. For every commit tagged UPSTREAM, do `git cherry-pick <commit SHA>`.

 3. Notice that eventually the cherry-pick will be empty. This probably means the given change were

 already merged in Kubernetes and we don't need to specifically add it to our Godeps. Nice!

@@ -302,7 +302,7 @@ Place all your changes in a commit called "Refactor to match changes upstream".

 A typical pull request for your Kubernetes rebase will contain:

-1. One commit for the Godeps bump (`bump(github.com/GoogleCloudPlatform/kubernetes):<commit SHA>`).

+1. One commit for the Godeps bump (`bump(k8s.io/kubernetes):<commit SHA>`).

 2. Zero, one or more cherry-picked commits tagged UPSTREAM.

 3. One commit "Refactor to match changes upstream".

@@ -7,9 +7,9 @@ import (

 	"runtime"

 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	pkg_runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/api"

+	pkg_runtime "k8s.io/kubernetes/pkg/runtime"

+	"k8s.io/kubernetes/pkg/util"

 	"github.com/golang/glog"

 	flag "github.com/spf13/pflag"

@@ -41,8 +41,8 @@ func main() {

 	}

 	generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw(), "github.com/openshift/origin/pkg/api")

-	apiShort := generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")

-	generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource")

+	apiShort := generator.AddImport("k8s.io/kubernetes/pkg/api")

+	generator.AddImport("k8s.io/kubernetes/pkg/api/resource")

 	generator.AssumePrivateConversions()

 	// TODO(wojtek-t): Change the overwrites to a flag.

 	generator.OverwritePackage(*version, "")

@@ -54,7 +54,7 @@ func main() {

 			glog.Errorf("error while generating conversion functions for %v: %v", knownType, err)

 		}

 	}

-	generator.RepackImports(util.NewStringSet("github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"))

+	generator.RepackImports(util.NewStringSet("k8s.io/kubernetes/pkg/runtime"))

 	if err := generator.WriteImports(funcOut); err != nil {

 		glog.Fatalf("error while writing imports: %v", err)

 	}

@@ -23,9 +23,9 @@ import (

 	"runtime"

 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	pkg_runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/api"

+	pkg_runtime "k8s.io/kubernetes/pkg/runtime"

+	"k8s.io/kubernetes/pkg/util"

 	"github.com/golang/glog"

 	flag "github.com/spf13/pflag"

@@ -62,8 +62,8 @@ func main() {

 		knownVersion = api.Scheme.Raw().InternalVersion

 	}

 	generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), "github.com/openshift/origin/pkg/api", util.NewStringSet("github.com/openshift/origin"))

-	apiShort := generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")

-	generator.ReplaceType("github.com/GoogleCloudPlatform/kubernetes/pkg/util", "empty", struct{}{})

+	apiShort := generator.AddImport("k8s.io/kubernetes/pkg/api")

+	generator.ReplaceType("k8s.io/kubernetes/pkg/util", "empty", struct{}{})

 	for _, overwrite := range strings.Split(*overwrites, ",") {

 		vals := strings.Split(overwrite, "=")

@@ -15,11 +15,11 @@ import (

 	"github.com/golang/glog"

 	flag "github.com/spf13/pflag"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"

-	kruntime "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/kubectl/resource"

+	kruntime "k8s.io/kubernetes/pkg/runtime"

+	"k8s.io/kubernetes/pkg/util"

 	"github.com/openshift/origin/pkg/api/latest"

 	templateapi "github.com/openshift/origin/pkg/template/api"

@@ -199,7 +199,7 @@ There are a number of helper functions available in `cmdutil` and `kcmdutil`. Im

 ----

 import (

   (...)

-  kcmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"

+  kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

   cmdutil "github.com/openshift/origin/pkg/cmd/util"

 ----

 ====

@@ -285,7 +285,7 @@ func (o DeployOptions) RunDeploy() error {

 <6> `Complete(f *clientcmd.Factory, cmd *cobra.Command, args []string, out io.Writer) error` is used to populate any object or variable that will be required to run the command and is still missing at this point. For example, if the command will make use of an API client it can be created from the factory in this method. Can also be used to take argument values from the `args` slice and hold it in explicit variables in your struct, store the `io.Writer` that will be used later, etc.

 <7> `Validate(args []string) error` perform validations on arguments as required. Notice that if the `Complete` and `Validate` methods implementations are simple enough, you may have only one of them that does both.

 <8> `Run<Command>() error` (e.g. `RunDeploy`, `RunCreate` and so on) does the actual command logic and returns errors as required. Notice that this method does not take anything as argument - it's expected that you previously extracted and stored in the `struct` anything that will be needed to run this command. This makes commands more easily testable once you can run and populate the command struct with the values you want to test and then just run this method and check for the returned error(s).

-<9> Try to always use the functions in `github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util` to check and handle errors. It is not expected that commands call `glog.Fatalf`, `os.Exit` or anything similar directly.

+<9> Try to always use the functions in `k8s.io/kubernetes/pkg/kubectl/cmd/util` to check and handle errors. It is not expected that commands call `glog.Fatalf`, `os.Exit` or anything similar directly.

 ====

@@ -7,11 +7,11 @@ import (

 	"reflect"

 	"testing"

-	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	kvalidation "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

 	"github.com/golang/glog"

+	kapi "k8s.io/kubernetes/pkg/api"

+	kvalidation "k8s.io/kubernetes/pkg/api/validation"

+	"k8s.io/kubernetes/pkg/capabilities"

+	"k8s.io/kubernetes/pkg/runtime"

 	"github.com/openshift/origin/pkg/api/latest"

 	"github.com/openshift/origin/pkg/api/validation"

@@ -420,8 +420,8 @@ os::build::os_version_vars() {

 # os::build::kube_version_vars returns the version of Kubernetes we have

 # vendored.

 os::build::kube_version_vars() {

-  KUBE_GIT_VERSION=$(go run "${OS_ROOT}/hack/version.go" "${OS_ROOT}/Godeps/Godeps.json" "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "comment")

-  KUBE_GIT_COMMIT=$(go run "${OS_ROOT}/hack/version.go" "${OS_ROOT}/Godeps/Godeps.json" "github.com/GoogleCloudPlatform/kubernetes/pkg/api")

+  KUBE_GIT_VERSION=$(go run "${OS_ROOT}/hack/version.go" "${OS_ROOT}/Godeps/Godeps.json" "k8s.io/kubernetes/pkg/api" "comment")

+  KUBE_GIT_COMMIT=$(go run "${OS_ROOT}/hack/version.go" "${OS_ROOT}/Godeps/Godeps.json" "k8s.io/kubernetes/pkg/api")

 }

 # Saves the environment flags to $1

@@ -460,8 +460,8 @@ os::build::ldflags() {

     ldflags+=(-X "${OS_GO_PACKAGE}/pkg/version.minorFromGit" "${OS_GIT_MINOR}")

     ldflags+=(-X "${OS_GO_PACKAGE}/pkg/version.versionFromGit" "${OS_GIT_VERSION}")

     ldflags+=(-X "${OS_GO_PACKAGE}/pkg/version.commitFromGit" "${OS_GIT_COMMIT}")

-    ldflags+=(-X "github.com/GoogleCloudPlatform/kubernetes/pkg/version.gitCommit" "${KUBE_GIT_COMMIT}")

-    ldflags+=(-X "github.com/GoogleCloudPlatform/kubernetes/pkg/version.gitVersion" "${KUBE_GIT_VERSION}")

+    ldflags+=(-X "k8s.io/kubernetes/pkg/version.gitCommit" "${KUBE_GIT_COMMIT}")

+    ldflags+=(-X "k8s.io/kubernetes/pkg/version.gitVersion" "${KUBE_GIT_VERSION}")

     # The -ldflags parameter takes a single string, so join the output.

     echo "${ldflags[*]-}"

@@ -10,9 +10,9 @@ import (

 	"github.com/golang/glog"

 	flag "github.com/spf13/pflag"

-	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

+	kapi "k8s.io/kubernetes/pkg/api"

+	"k8s.io/kubernetes/pkg/conversion"

+	"k8s.io/kubernetes/pkg/util"

 	_ "github.com/openshift/origin/pkg/api/latest"

 )

@@ -11,7 +11,7 @@ source "${OS_ROOT}/hack/common.sh"

 cd "${OS_ROOT}"

 KUBE_ROOT=${1:-""}

-KUBE_GODEP_ROOT="${OS_ROOT}/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes"

+KUBE_GODEP_ROOT="${OS_ROOT}/Godeps/_workspace/src/k8s.io/kubernetes"

 if [ -z "$KUBE_ROOT" ]; then

   echo "usage: copy-kube-artifacts.sh <kubernetes root dir>"

@@ -23,13 +23,13 @@ make clean

 godep restore

 git fetch --tags

-pushd $GOPATH/src/github.com/GoogleCloudPlatform/kubernetes > /dev/null

+pushd $GOPATH/src/k8s.io/kubernetes > /dev/null

 echo "Fetching latest ..."

 git fetch

 git fetch --tags

 popd > /dev/null

-pushd $GOPATH/src/github.com/GoogleCloudPlatform/kubernetes > /dev/null

+pushd $GOPATH/src/k8s.io/kubernetes > /dev/null

 git checkout stable_proposed

 echo "Restoring any newer Kubernetes dependencies ..."

 rm -rf _output Godeps/_workspace/pkg

@@ -14,7 +14,7 @@ cd "${OS_ROOT}"

 PRINT_PACKAGES=${PRINT_PACKAGES:-""}

 TEST_KUBE=${TEST_KUBE:-""}

-KUBE_GODEP_PATH="./Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg"

+KUBE_GODEP_PATH="./Godeps/_workspace/src/k8s.io/kubernetes/pkg"

 os::build::setup_env

@@ -44,11 +44,11 @@ special_upstream_test_dirs() {

 # https://github.com/GoogleCloudPlatform/kubernetes/pull/9971

 find_upstream_test_dirs() {

   cd "${OS_ROOT}"

-  find ./Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes -not \( \

+  find ./Godeps/_workspace/src/k8s.io/kubernetes -not \( \

       \( \

         -wholename "${KUBE_GODEP_PATH}/api" \

         -o -wholename "${KUBE_GODEP_PATH}/api/v1" \

-        -o -wholename './Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/runtime' \

+        -o -wholename './Godeps/_workspace/src/k8s.io/kubernetes/pkg/runtime' \

       \) -prune \

     \) -name '*_test.go' -print0 | xargs -0n1 dirname | sort -u | xargs -n1 printf "${OS_GO_PACKAGE}/%s\n"

 }

@@ -19,7 +19,7 @@

 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 # OpenShift specific ldflags from hack/common.sh os::build:ldflags

 %{!?ldflags:

-%global ldflags -X github.com/openshift/origin/pkg/version.majorFromGit 0 -X github.com/openshift/origin/pkg/version.minorFromGit 0+ -X github.com/openshift/origin/pkg/version.versionFromGit v0.0.1 -X github.com/openshift/origin/pkg/version.commitFromGit 86b5e46 -X github.com/GoogleCloudPlatform/kubernetes/pkg/version.gitCommit 6241a21 -X github.com/GoogleCloudPlatform/kubernetes/pkg/version.gitVersion v0.11.0-330-g6241a21

+%global ldflags -X github.com/openshift/origin/pkg/version.majorFromGit 0 -X github.com/openshift/origin/pkg/version.minorFromGit 0+ -X github.com/openshift/origin/pkg/version.versionFromGit v0.0.1 -X github.com/openshift/origin/pkg/version.commitFromGit 86b5e46 -X k8s.io/kubernetes/pkg/version.gitCommit 6241a21 -X k8s.io/kubernetes/pkg/version.gitVersion v0.11.0-330-g6241a21

 }

 Name:           openshift

@@ -9,10 +9,10 @@ import (

 	"strings"

 	"testing"

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

 )

 func TestCompatibility_v1_Pod(t *testing.T) {

@@ -2,11 +2,7 @@ package api

 // AUTO-GENERATED FUNCTIONS START HERE

 import (

-	api "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	conversion "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"

-	runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

-	util "github.com/GoogleCloudPlatform/kubernetes/pkg/util"

-	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

+	api "github.com/openshift/origin/pkg/authorization/api"

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	imageapi "github.com/openshift/origin/pkg/image/api"

@@ -16,18 +12,22 @@ import (

 	sdnapi "github.com/openshift/origin/pkg/sdn/api"

 	templateapi "github.com/openshift/origin/pkg/template/api"

 	userapi "github.com/openshift/origin/pkg/user/api"

+	pkgapi "k8s.io/kubernetes/pkg/api"

+	conversion "k8s.io/kubernetes/pkg/conversion"

+	runtime "k8s.io/kubernetes/pkg/runtime"

+	util "k8s.io/kubernetes/pkg/util"

 )

-func deepCopy_api_ClusterPolicy(in authorizationapi.ClusterPolicy, out *authorizationapi.ClusterPolicy, c *conversion.Cloner) error {

+func deepCopy_api_ClusterPolicy(in api.ClusterPolicy, out *api.ClusterPolicy, c *conversion.Cloner) error {

 	if newVal, err := c.DeepCopy(in.TypeMeta); err != nil {

 		return err

 	} else {

-		out.TypeMeta = newVal.(api.TypeMeta)

+		out.TypeMeta = newVal.(pkgapi.TypeMeta)

 	}

 	if newVal, err := c.DeepCopy(in.ObjectMeta); err != nil {

 		return err

 	} else {

-		out.ObjectMeta = newVal.(api.ObjectMeta)

+		out.ObjectMeta = newVal.(pkgapi.ObjectMeta)

 	}

 	if newVal, err := c.DeepCopy(in.LastModified); err != nil {

 		return err

@@ -35,12 +35,12 @@ func deepCopy_api_ClusterPolicy(in authorizationapi.ClusterPolicy, out *authoriz

 		out.LastModified = newVal.(util.Time)

 	}

 	if in.Roles != nil {

-		out.Roles = make(map[string]*authorizationapi.ClusterRole)

+		out.Roles = make(map[string]*api.ClusterRole)

 		for key, val := range in.Roles {

 			if newVal, err := c.DeepCopy(val); err != nil {

 				return err

 			} else {

-				out.Roles[key] = newVal.(*authorizationapi.ClusterRole)

+				out.Roles[key] = newVal.(*api.ClusterRole)

 			}

 		}

 	} else {

@@ -49,16 +49,16 @@ func deepCopy_api_ClusterPolicy(in authorizationapi.ClusterPolicy, out *authoriz

 	return nil

 }

-func deepCopy_api_ClusterPolicyBinding(in authorizationapi.ClusterPolicyBinding, out *authorizationapi.ClusterPolicyBinding, c *conversion.Cloner) error {

+func deepCopy_api_ClusterPolicyBinding(in api.ClusterPolicyBinding, out *api.ClusterPolicyBinding, c *conversion.Cloner) error {

 	if newVal, err := c.DeepCopy(in.TypeMeta); err != nil {

 		return err

 	} else {

-		out.TypeMeta = newVal.(api.TypeMeta)

+		out.TypeMeta = newVal.(pkgapi.TypeMeta)

 	}

 	if newVal, err := c.DeepCopy(in.ObjectMeta); err != nil {

 		return err

 	} else {

-		out.ObjectMeta = newVal.(api.ObjectMeta)

+		out.ObjectMeta = newVal.(pkgapi.ObjectMeta)

 	}

 	if newVal, err := c.DeepCopy(in.LastModified); err != nil {

 		return err

@@ -68,15 +68,15 @@ func deepCopy_api_ClusterPolicyBinding(in authorizationapi.ClusterPolicyBinding,

 	if newVal, err := c.DeepCopy(in.PolicyRef); err != nil {

 		return err

 	} else {

-		out.PolicyRef = newVal.(api.ObjectReference)

+		out.PolicyRef = newVal.(pkgapi.ObjectReference)

 	}

 	if in.RoleBindings != nil {

-		out.RoleBindings = make(map[string]*authorizationapi.ClusterRoleBinding)

+		out.RoleBindings = make(map[string]*api.ClusterRoleBinding)

 		for key, val := range in.RoleBindings {

 			if newVal, err := c.DeepCopy(val); err != nil {

 				return err

 			} else {

-				out.RoleBindings[key] = newVal.(*authorizationapi.ClusterRoleBinding)

+				out.RoleBindings[key] = newVal.(*api.ClusterRoleBinding)

 			}

 		}

 	} else {

@@ -85,19 +85,19 @@ func deepCopy_api_ClusterPolicyBinding(in authorizationapi.ClusterPolicyBinding,

 	return nil

 }

-func deepCopy_api_ClusterPolicyBindingList(in authorizationapi.ClusterPolicyBindingList, out *authorizationapi.ClusterPolicyBindingList, c *conversion.Cloner) error {

+func deepCopy_api_ClusterPolicyBindingList(in api.ClusterPolicyBindingList, out *api.ClusterPolicyBindingList, c *conversion.Cloner) error {

 	if newVal, err := c.DeepCopy(in.TypeMeta); err != nil {

 		return err

 	} else {

-		out.TypeMeta = newVal.(api.TypeMeta)

+		out.TypeMeta = newVal.(pkgapi.TypeMeta)

 	}

 	if newVal, err := c.DeepCopy(in.ListMeta); err != nil {

 		return err

 	} else {

-		out.ListMeta = newVal.(api.ListMeta)

+		out.ListMeta = newVal.(pkgapi.ListMeta)

 	}

 	if in.Items != nil {

-		out.Items = make([]authorizationapi.ClusterPolicyBinding, len(in.Items))

+		out.Items = make([]api.ClusterPolicyBinding, len(in.Items))

 		for i := range in.Items {

 			if err := deepCopy_api_ClusterPolicyBinding(in.Items[i], &out.Items[i], c); err != nil {

 				return err

@@ -109,19 +109,19 @@ func deepCopy_api_ClusterPolicyBindingList(in authorizationapi.ClusterPolicyBind

 	return nil

 }

-func deepCopy_api_ClusterPolicyList(in authorizationapi.ClusterPolicyList, out *authorizationapi.ClusterPolicyList, c *conversion.Cloner) error {

+func deepCopy_api_ClusterPolicyList(in api.ClusterPolicyList, out *api.ClusterPolicyList, c *conversion.Cloner) error {

 	if newVal, err := c.DeepCopy(in.TypeMeta); err != nil {

 		return err

 	} else {

-		out.TypeMeta = newVal.(api.TypeMeta)

+		out.TypeMeta = newVal.(pkgapi.TypeMeta)

 	}

 	if newVal, err := c.DeepCopy(in.ListMeta); err != nil {

 		return err

 	} else {

-		out.ListMeta = newVal.(api.ListMeta)

+		out.ListMeta = newVal.(pkgapi.ListMeta)

 	}

 	if in.Items != nil {

-		out.Items = make([]authorizationapi.ClusterPolicy, len(in.Items))

+		out.Items = make([]api.ClusterPolicy, len(in.Items))

 		for i := range in.Items {

 			if err := deepCopy_api_ClusterPolicy(in.Items[i], &out.Items[i], c); err != nil {

 				return err

@@ -133,19 +133,19 @@ func deepCopy_api_ClusterPolicyList(in authorizationapi.ClusterPolicyList, out *

 	return nil

 }

-func deepCopy_api_ClusterRole(in authorizationapi.ClusterRole, out *authorizationapi.ClusterRole, c *conversion.Cloner) error {

+func deepCopy_api_ClusterRole(in api.ClusterRole, out *api.ClusterRole, c *conversion.Cloner) error {

 	if newVal, err := c.DeepCopy(in.TypeMeta); err != nil {

 		return err

 	} else {

-		out.TypeMeta = newVal.(api.TypeMeta)

+		out.TypeMeta = newVal.(pkgapi.TypeMeta)

 	}

 	if newVal, err := c.DeepCopy(in.ObjectMeta); err != nil {

 		return err

 	} else {

-		out.ObjectMeta = newVal.(api.ObjectMeta)

+		out.ObjectMeta = newVal.(pkgapi.ObjectMeta)

 	}

 	if in.Rules != nil {

-		out.Rules = make([]authorizationapi.PolicyRule, len(in.Rules))

+		out.Rules = make([]api.PolicyRule, len(in.Rules))

 		for i := range in.Rules {

 			if err := deepCopy_api_PolicyRule(in.Rules[i], &out.Rules[i], c); err != nil {

 				return err

@@ -157,16 +157,16 @@ func deepCopy_api_ClusterRole(in authorizationapi.ClusterRole, out *authorizatio

 	return nil

 }

-func deepCopy_api_ClusterRoleBinding(in authorizationapi.ClusterRoleBinding, out *authorizationapi.ClusterRoleBinding, c *conversion.Cloner) error {

+func deepCopy_api_ClusterRoleBinding(in api.ClusterRoleBinding, out *api.ClusterRoleBinding, c *conversion.Cloner) error {

 	if newVal, err := c.DeepCopy(in.TypeMeta); err != nil {

 		return err

 	} else {

-		out.TypeMeta = newVal.(api.TypeMeta)

+		out.TypeMeta = newVal.(pkgapi.TypeMeta)

 	}

 	if newVal, err := c.DeepCopy(in.ObjectMeta); err != nil {

 		return err

 	} else {

-		out.ObjectMeta = newVal.(api.ObjectMeta)

+		out.ObjectMeta = newVal.(pkgapi.ObjectMeta)

 	}

 	if in.Users != nil {

 		out.Users = make(util.StringSet)

@@ -195,24 +195,24 @@ func deepCopy_api_ClusterRoleBinding(in authorizationapi.ClusterRoleBinding, out

 	if newVal, err := c.DeepCopy(in.RoleRef); err != nil {

 		return err

 	} else {

-		out.RoleRef = newVal.(api.ObjectReference)

+		out.RoleRef = newVal.(pkgapi.ObjectReference)

 	}

 	return nil

 }

-func deepCopy_api_ClusterRoleBindingList(in authorizationapi.ClusterRoleBindingList, out *authorizationapi.ClusterRoleBindingList, c *conversion.Cloner) error {

+func deepCopy_api_ClusterRoleBindingList(in api.ClusterRoleBindingList, out *api.ClusterRoleBindingList, c *conversion.Cloner) error {

 	if newVal, err := c.DeepCopy(in.TypeMeta); err != nil {

 		return err

 	} else {

-		out.TypeMeta = newVal.(api.TypeMeta)

+		out.TypeMeta = newVal.(pkgapi.TypeMeta)

 	}

 	if newVal, err := c.DeepCopy(in.ListMeta); err != nil {

 		return err

 	} else {

-		out.ListMeta = newVal.(api.ListMeta)

+		out.ListMeta = newVal.(pkgapi.ListMeta)

 	}

 	if in.Items != nil {

-		out.Items = make([]authorizationapi.ClusterRoleBinding, len(in.Items))

+		out.Items = make([]api.ClusterRoleBinding, len(in.Items))

 		for i := range in.Items {

 			if err := deepCopy_api_ClusterRoleBinding(in.Items[i], &out.Items[i], c); err != nil {

 				return err

@@ -224,19 +224,19 @@ func deepCopy_api_ClusterRoleBindingList(in authorizationapi.ClusterRoleBindingL

 	return nil

 }

-func deepCopy_api_ClusterRoleList(in authorizationapi.ClusterRoleList, out *authorizationapi.ClusterRoleList, c *conversion.Cloner) error {

+func deepCopy_api_ClusterRoleList(in api.ClusterRoleList, out *api.ClusterRoleList, c *conversion.Cloner) error {

 	if newVal, err := c.DeepCopy(in.TypeMeta); err != nil {

 		return err

 	} else {

-		out.TypeMeta = newVal.(api.TypeMeta)

+		out.TypeMeta = newVal.(pkgapi.TypeMeta)

 	}

 	if newVal, err := c.DeepCopy(in.ListMeta); err != nil {

 		return err

 	} else {

-		out.ListMeta = newVal.(api.ListMeta)

+		out.ListMeta = newVal.(pkgapi.ListMeta)

 	}

 	if in.Items != nil {

-		out.Items = make([]authorizationapi.ClusterRole, len(in.Items))

+		out.Items = make([]api.ClusterRole, len(in.Items))

 		for i := range in.Items {

 			if err := deepCopy_api_ClusterRole(in.Items[i], &out.Items[i], c); err != nil {

 				return err

@@ -248,25 +248,25 @@ func deepCopy_api_ClusterRoleList(in authorizationapi.ClusterRoleList, out *auth