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

 To run unit test for an individual kubernetes package:

-    $ hack/test-go.sh Godeps/_workspace/src/k8s.io/kubernetes/examples

+    $ hack/test-go.sh vendor/k8s.io/kubernetes/examples

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

@@ -217,7 +217,7 @@ Docker. More information about running extended tests can be found in [test/exte

 OpenShift and Kubernetes use [Godep](https://github.com/tools/godep) for dependency management.

 Godep allows versions of dependent packages to be locked at a specific commit by *vendoring* them

-(checking a copy of them into `Godeps/_workspace/`).  This means that everything you need for

+(checking a copy of them into `vendor/`).  This means that everything you need for

 OpenShift is checked into this repository.  To install `godep` locally run:

     $ go get github.com/tools/godep

@@ -374,7 +374,7 @@ of Origin to your GOPATH.

 of Kubernetes to your GOPATH.

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

 6. `$ make clean ; godep save ./...` will save a list of the checked-out dependencies to the file

-`Godeps/Godeps.json`, and copy their source code into `Godeps/_workspace`.

+`Godeps/Godeps.json`, and copy their source code into `vendor`.

 7. If in the previous step godep complaints about the checked out revision of a package being different

 than the wanted revision, this probably means there are new packages in Kubernetes that we need to add.

 Do a `godep save <pkgname>` with the package specified by the error message and then `$ godep save ./...`

@@ -448,7 +448,7 @@ A typical pull request for your Kubernetes rebase will contain:

 To update to a new version of a dependency that's not already included in Kubernetes, checkout the

 correct version in your GOPATH and then run `godep save <pkgname>`.  This should create a new

-version of `Godeps/Godeps.json`, and update `Godeps/_workspace/src`.  Create a commit that includes

+version of `Godeps/Godeps.json`, and update `vendor`.  Create a commit that includes

 both of these changes with message `bump(<pkgname>): <pkgcommit>`.

 ## Updating external examples

@@ -9,7 +9,6 @@

 #   clean: Clean up.

 OUT_DIR = _output

-OUT_PKG_DIR = Godeps/_workspace/pkg

 OS_OUTPUT_GOPATH ?= 1

 export GOFLAGS

@@ -33,6 +32,16 @@ all build:

 	hack/build-go.sh $(WHAT)

 .PHONY: all build

+# Build the test binaries.

+#

+# Example:

+#   make build-tests

+build-tests:

+	hack/build-go.sh test/extended/extended.test

+	hack/build-go.sh test/extended/networking/extended.test

+	hack/build-go.sh test/integration/integration.test -tags='integration docker'

+.PHONY: build-tests

+

 # Run core verification and all self contained tests.

 #

 # Example:

@@ -47,7 +56,7 @@ check: | build verify

 # Example:

 #   make verify

 verify: build

-	hack/build-go.sh test/extended/extended.test test/extended/networking/extended.test test/integration/integration.test -tags='integration docker'

+	# build-tests is disabled until we can determine why memory usage is so high

 	hack/verify-upstream-commits.sh

 	hack/verify-gofmt.sh

 	hack/verify-govet.sh

@@ -154,7 +163,7 @@ run: build

 # Example:

 #   make clean

 clean:

-	rm -rf $(OUT_DIR) $(OUT_PKG_DIR)

+	rm -rf $(OUT_DIR)

 .PHONY: clean

 # Build an official release of OpenShift, including the official images.

@@ -63,14 +63,14 @@ if [[ -z "${NO_REBASE-}" ]]; then

   # stage any new files

   git add . > /dev/null

   # construct a new patch

-  git diff --cached -p --raw --binary --{src,dst}-prefix=a/Godeps/_workspace/src/${repo}/ > "${patch}"

+  git diff --cached -p --raw --binary --{src,dst}-prefix=a/vendor/${repo}/ > "${patch}"

   # cleanup the current state

   git reset HEAD --hard > /dev/null

   git checkout master > /dev/null

   git branch -D last_upstream_branch > /dev/null

 else

   echo "++ Generating patch for ${selector} without rebasing ..." 2>&1

-  git diff -p --raw --binary --{src,dst}-prefix=a/Godeps/_workspace/src/${repo}/ "${selector}" > "${patch}"

+  git diff -p --raw --binary --{src,dst}-prefix=a/vendor/${repo}/ "${selector}" > "${patch}"

 fi

 popd > /dev/null

@@ -30,11 +30,6 @@ readonly OS_LOCAL_RELEASEPATH="${OS_OUTPUT}/releases"

 readonly OS_OUTPUT_BINPATH="${OS_OUTPUT}/bin"

 readonly OS_GO_PACKAGE=github.com/openshift/origin

-readonly OS_GOPATH=$(

-  unset CDPATH

-  cd ${OS_ROOT}/../../../..

-  pwd

-)

 readonly OS_IMAGE_COMPILE_PLATFORMS=(

   linux/amd64

@@ -191,23 +186,30 @@ EOF

   if [[ "${TRAVIS:-}" != "true" ]]; then

     local go_version

     go_version=($(go version))

-    if [[ "${go_version[2]}" < "go1.4" ]]; then

+    if [[ "${go_version[2]}" < "go1.5" ]]; then

       cat <<EOF

 Detected Go version: ${go_version[*]}.

-Origin builds require Go version 1.4 or greater.

+Origin builds require Go version 1.6 or greater.

 EOF

       exit 2

     fi

   fi

+  # For any tools that expect this to be set (it is default in golang 1.6),

+  # force vendor experiment.

+  export GO15VENDOREXPERIMENT=1

   unset GOBIN

+  # default to OS_OUTPUT_GOPATH if no GOPATH set

+  if [[ -z "${GOPATH:-}" ]]; then

+    export OS_OUTPUT_GOPATH=1

+  fi

+

   # use the regular gopath for building

   if [[ -z "${OS_OUTPUT_GOPATH:-}" ]]; then

-    export GOPATH=${OS_ROOT}/Godeps/_workspace:${OS_GOPATH}

-    export OS_TARGET_BIN=${OS_GOPATH}/bin

+    export OS_TARGET_BIN=${GOPATH}/bin

     return

   fi

@@ -223,18 +225,15 @@ EOF

   # TODO: This symlink should be relative.

   ln -s "${OS_ROOT}" "${go_pkg_dir}"

+  # lots of tools "just don't work" unless we're in the GOPATH

+  cd "${go_pkg_dir}"

+

   # Append OS_EXTRA_GOPATH to the GOPATH if it is defined.

   if [[ -n ${OS_EXTRA_GOPATH:-} ]]; then

     GOPATH="${GOPATH}:${OS_EXTRA_GOPATH}"

     # TODO: needs to handle multiple directories

     OS_TARGET_BIN=${OS_EXTRA_GOPATH}/bin

   fi

-  # Append the tree maintained by `godep` to the GOPATH unless OS_NO_GODEPS

-  # is defined.

-  if [[ -z ${OS_NO_GODEPS:-} ]]; then

-    GOPATH="${GOPATH}:${OS_ROOT}/Godeps/_workspace"

-    OS_TARGET_BIN=${OS_ROOT}/Godeps/_workspace/bin

-  fi

   export GOPATH

   export OS_TARGET_BIN

 }

@@ -262,7 +261,7 @@ readonly -f os::build::build_static_binaries

 function os::build::build_binaries() {

   local -a binaries=( "$@" )

   # Create a sub-shell so that we don't pollute the outer environment

-  ( os::build::internal::build_binaries "${binaries[@]+"${binaries[@]}"}" )  

+  ( os::build::internal::build_binaries "${binaries[@]+"${binaries[@]}"}" )

 }

 # Build binary targets specified. Should always be run in a sub-shell so we don't leak GOBIN

@@ -740,8 +739,8 @@ function os::build::ldflags() {

   ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/pkg/version.minorFromGit" "${OS_GIT_MINOR}"))

   ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/pkg/version.versionFromGit" "${OS_GIT_VERSION}"))

   ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/pkg/version.commitFromGit" "${OS_GIT_COMMIT}"))

-  ldflags+=($(os::build::ldflag "k8s.io/kubernetes/pkg/version.gitCommit" "${OS_GIT_COMMIT}"))

-  ldflags+=($(os::build::ldflag "k8s.io/kubernetes/pkg/version.gitVersion" "${KUBE_GIT_VERSION}"))

+  ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/vendor/k8s.io/kubernetes/pkg/version.gitCommit" "${OS_GIT_COMMIT}"))

+  ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/vendor/k8s.io/kubernetes/pkg/version.gitVersion" "${KUBE_GIT_VERSION}"))

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

   echo "${ldflags[*]-}"

@@ -12,8 +12,9 @@ source "${OS_ROOT}/hack/lib/init.sh"

 # Go to the top of the tree.

 cd "${OS_ROOT}"

+GODEP_ROOT="${OS_ROOT}/vendor"

 KUBE_ROOT=${1:-""}

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

+KUBE_GODEP_ROOT="${GODEP_ROOT}/k8s.io/kubernetes"

 if [ -z "$KUBE_ROOT" ]; then

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

@@ -44,6 +45,7 @@ rsync -av \

 /docs/user-guide/simple-yaml.md

 /docs/user-guide/walkthrough/README.md

 /examples/***

+/federation/client/clientset_generated/**.go

 /pkg/***

 /plugin/***

 /test/e2e/***

@@ -52,3 +54,16 @@ rsync -av \

 /third_party/golang/***

 /README.md

 EOF

+

+# Copy extra vendored files that aren't direct dependencies of any package

+rsync -av \

+  --exclude='examples/blog-logging/diagrams/***' \

+  --exclude='pkg/ui/data/swagger/datafile.go' \

+  --include-from=- \

+  --include='*/' \

+  --exclude='*' \

+  --prune-empty-dirs \

+  $KUBE_ROOT/vendor/ $GODEP_ROOT <<EOF

+/github.com/golang/mock/gomock/**.go

+/github.com/google/cadvisor/info/v1/test/**.go

+EOF

@@ -12,15 +12,12 @@ os::log::stacktrace::install

 EXAMPLES=examples

 OUTPUT_PARENT=${OUTPUT_ROOT:-$OS_ROOT}

-pushd ${OS_ROOT}/Godeps/_workspace > /dev/null

-  godep_path=$(pwd)

-  pushd src/github.com/jteeuwen/go-bindata > /dev/null

-    GOPATH=$godep_path go install ./...

-  popd > /dev/null

+pushd vendor/github.com/jteeuwen/go-bindata > /dev/null

+  go install ./...

 popd > /dev/null

 pushd "${OS_ROOT}" > /dev/null

-  Godeps/_workspace/bin/go-bindata -nocompress -nometadata -prefix "bootstrap" -pkg "bootstrap" \

+  "${GOPATH}/bin/go-bindata" -nocompress -nometadata -prefix "bootstrap" -pkg "bootstrap" \

                                    -o "${OUTPUT_PARENT}/pkg/bootstrap/bindata.go" -ignore "README.md" \

                                    ${EXAMPLES}/image-streams/... \

                                    ${EXAMPLES}/db-templates/... \

@@ -47,8 +47,8 @@ fi

 echo "++ Generating patch for ${selector} onto ${lastrev} ..." 2>&1

 index=0

-for commit in $(git log --no-merges --format="%H" --reverse "${selector}" -- "Godeps/_workspace/src/${repo}/"); do

-  git format-patch --raw --start-number=${index} --relative="Godeps/_workspace/src/${repo}/" "${commit}^..${commit}" -o "${patch}"

+for commit in $(git log --no-merges --format="%H" --reverse "${selector}" -- "vendor/${repo}/"); do

+  git format-patch --raw --start-number=${index} --relative="vendor/${repo}/" "${commit}^..${commit}" -o "${patch}"

   let index+=10

 done

@@ -12,7 +12,7 @@ echo "This command will update Origin with the latest stable_proposed branch or

 echo "in your OpenShift fork of Kubernetes."

 echo

 echo "This command is destructive and will alter the contents of your GOPATH projects"

-echo 

+echo

 echo "Hit ENTER to continue or CTRL+C to cancel"

 read

@@ -32,7 +32,7 @@ popd > /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

+rm -rf _output

 godep restore

 popd > /dev/null

@@ -130,11 +130,11 @@ function list_test_packages_under() {

     # arguments that use expansion, e.g. paths containing brace expansion or wildcards

     find ${basedir} -not \(                   \

         \(                                    \

-              -path 'Godeps'                  \

+              -path 'vendor'                  \

               -o -path '*_output'             \

               -o -path '*.git'                \

               -o -path '*openshift.local.*'   \

-              -o -path '*Godeps/*'            \

+              -o -path '*vendor/*'            \

               -o -path '*assets/node_modules' \

               -o -path '*test/*'              \

         \) -prune                             \

@@ -156,7 +156,7 @@ done

 gotest_flags+=" $*"

 # Determine packages to test

-godeps_package_prefix="Godeps/_workspace/src/"

+godeps_package_prefix="vendor/"

 test_packages=

 if [[ -n "${package_args}" ]]; then

     for package in ${package_args}; do

@@ -171,8 +171,8 @@ else

     # If no packages are given to test, we need to generate a list of all packages with unit tests

     openshift_test_packages="$(list_test_packages_under '*')"

-    kubernetes_path="Godeps/_workspace/src/k8s.io/kubernetes"

-    mandatory_kubernetes_packages="${OS_GO_PACKAGE}/${kubernetes_path}/pkg/api ${OS_GO_PACKAGE}/${kubernetes_path}/pkg/api/v1"

+    kubernetes_path="vendor/k8s.io/kubernetes"

+    mandatory_kubernetes_packages="./vendor/k8s.io/kubernetes/pkg/api ./vendor/k8s.io/kubernetes/pkg/api/v1"

     test_packages="${openshift_test_packages} ${mandatory_kubernetes_packages}"

@@ -184,12 +184,12 @@ else

           \(                                                                                          \

             -path "${kubernetes_path}/pkg/api"                                                        \

             -o -path "${kubernetes_path}/pkg/api/v1"                                                  \

-            -o -path "${kubernetes_path}/test/e2e"                                                    \

+            -o -path "${kubernetes_path}/test"                                                        \

             -o -path "${kubernetes_path}/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned" \

             -o -path "${kubernetes_path}/pkg/storage/etcd3"                                           \

             -o -path "${kubernetes_path}/third_party/golang/go/build"                                 \

           \) -prune                                                                                   \

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

+        \) -name '*_test.go' | cut -f 2- -d / | xargs -n1 dirname | sort -u | xargs -n1 printf "./vendor/%s\n")"

         test_packages="${test_packages} ${optional_kubernetes_packages}"

     fi

@@ -208,7 +208,7 @@ fi

 # Run 'go test' with the accumulated arguments and packages:

 if [[ -n "${junit_report}" ]]; then

     # we need to generate jUnit xml

-    hack/build-go.sh tools/junitreport

+    "${OS_ROOT}/hack/build-go.sh" tools/junitreport

     junitreport="$(os::build::find-binary junitreport)"

     if [[ -z "${junitreport}" ]]; then

@@ -7,7 +7,9 @@ set -o pipefail

 OS_ROOT=$(dirname "${BASH_SOURCE}")/..

 source "${OS_ROOT}/hack/lib/init.sh"

-"${OS_ROOT}/hack/build-go.sh" Godeps/_workspace/src/k8s.io/kubernetes/cmd/libs/go2idl/client-gen

+os::build::setup_env

+

+"${OS_ROOT}/hack/build-go.sh" vendor/k8s.io/kubernetes/cmd/libs/go2idl/client-gen

 # Find binary

 clientgen="$(os::build::find-binary client-gen)"

@@ -10,7 +10,7 @@ OS_ROOT=$(dirname "${BASH_SOURCE}")/..

 source "${OS_ROOT}/hack/lib/init.sh"

 # ensure we have the latest compiled binaries

-(cd ${OS_ROOT} && make clean); "${OS_ROOT}/hack/build-go.sh"

+"${OS_ROOT}/hack/build-go.sh"

 platform="$(os::build::host_platform)"

 if [[ "${platform}" != "linux/amd64" ]]; then

@@ -10,9 +10,10 @@ source "${OS_ROOT}/hack/lib/init.sh"

 # Go to the top of the tree.

 cd "${OS_ROOT}"

+# Do not allow a synthetic GOPATH for these checks

 os::build::setup_env

-hack/build-go.sh tools/genconversion

+"${OS_ROOT}/hack/build-go.sh" tools/genconversion

 genconversion="$( os::build::find-binary genconversion )"

 if [[ -z "${genconversion}" ]]; then

@@ -23,4 +24,4 @@ if [[ -z "${genconversion}" ]]; then

 	exit 1

 fi

-${genconversion} --output-base="${OS_GOPATH}/src" "$@"

\ No newline at end of file

+${genconversion} --output-base="${GOPATH}/src" "$@"

\ No newline at end of file

@@ -10,9 +10,10 @@ source "${OS_ROOT}/hack/lib/init.sh"

 # Go to the top of the tree.

 cd "${OS_ROOT}"

+# Do not allow a synthetic GOPATH for these checks

 os::build::setup_env

-hack/build-go.sh tools/gendeepcopy

+"${OS_ROOT}/hack/build-go.sh" tools/gendeepcopy

 gendeepcopy="$( os::build::find-binary gendeepcopy )"

 if [[ -z "${gendeepcopy}" ]]; then

@@ -23,4 +24,4 @@ if [[ -z "${gendeepcopy}" ]]; then

 	exit 1

 fi

-${gendeepcopy} --output-base="${OS_GOPATH}/src" "$@"

\ No newline at end of file

+${gendeepcopy} --output-base="${GOPATH}/src" "$@"

\ No newline at end of file

@@ -2,7 +2,7 @@

 #

 # This script generates methods to allow our API objects to describe themsleves for the Swagger tool

 # by reading the current version of the Godoc for the objects. This script can either generate new

-# documentation or verify that the documentation currently in the repository remains valid. 

+# documentation or verify that the documentation currently in the repository remains valid.

 #

 # This script accepts the following parameters as environment variables:

 #  - VERIFY:  run the script to verify current documentation

@@ -23,7 +23,7 @@ dryrun="${DRY_RUN:-}"

 mkdir -p /tmp/openshift/generate/swaggerdoc

-hack/build-go.sh tools/genswaggerdoc

+"${OS_ROOT}/hack/build-go.sh" tools/genswaggerdoc

 genswaggerdoc="$( os::build::find-binary genswaggerdoc )"

 if [[ -z "${genswaggerdoc}" ]]; then

@@ -64,7 +64,7 @@ for file in ${source_files}; do

 " >> "${tmp_output_file}"

 		${genswaggerdoc} --input="${file}" --output="${tmp_output_file}"

 		gofmt -s -w "${tmp_output_file}"

-		

+

 		if [[ -n "${verify}" ]]; then

 			if ! diff --new-file --unified=3 --text "${tmp_output_file}" "${swagger_file}"; then

 				echo "[ERROR] Generated Swagger documentation at \"${swagger_file}\" is out of date."

@@ -560,7 +560,7 @@ function cleanup_openshift() {

 	set +e

 	dump_container_logs

- 	# pull information out of the server log so that we can get failure management in jenkins to highlight it and 

+ 	# pull information out of the server log so that we can get failure management in jenkins to highlight it and

 	# really have it smack people in their logs.  This is a severe correctness problem

 	grep -a5 "CACHE.*ALTERED" ${LOG_DIR}/openshift.log

@@ -758,7 +758,7 @@ function find_files() {

 		-o -wholename './pkg/assets/*/bindata.go' \

 		-o -wholename './pkg/bootstrap/bindata.go' \

 		-o -wholename './openshift.local.*' \

-		-o -wholename '*/Godeps/*' \

+		-o -wholename '*/vendor/*' \

 		-o -wholename './assets/bower_components/*' \

 		\) -prune \

 	\) -name '*.go' | sort -u

@@ -1,5 +1,5 @@

-#!/bin/bash 

-# 

+#!/bin/bash

+#

 #  This script vendors the Web Console source files into bindata.go files that can be built into the openshift binary.

 #

 #  Accepted environment variables are:

@@ -9,8 +9,8 @@

 #   - CONSOLE_REPO_PATH: specifies a directory path to look for the web console repo.  If not set it is assumed to be

 #                        a sibling to this repository.

-set -o errexit 

-set -o nounset 

+set -o errexit

+set -o nounset

 set -o pipefail

 OS_ROOT=$(dirname "${BASH_SOURCE}")/..

@@ -25,16 +25,13 @@ if [[ ! -d "$CONSOLE_REPO_PATH" ]]; then

 fi

 echo "Making sure go-bindata binary has been built..."

-pushd "${OS_ROOT}/Godeps/_workspace" > /dev/null

-  godep_path=$(pwd)

-  pushd src/github.com/jteeuwen/go-bindata > /dev/null

-    GOPATH=$godep_path go install ./...

-  popd > /dev/null

+pushd vendor/github.com/jteeuwen/go-bindata > /dev/null

+  go install ./...

 popd > /dev/null

-if [[ -z "${GIT_REF:+x}" ]]; then 

+if [[ -z "${GIT_REF:+x}" ]]; then

   echo "No git ref specified, using current state of the repo including any unstaged changes...";

-else 

+else

   echo "Using git ref ${GIT_REF} ..."

   pushd "${CONSOLE_REPO_PATH}" > /dev/null

     if [[ -n "$(git status --porcelain -uall)" ]]; then

@@ -52,9 +49,9 @@ pushd "${OS_ROOT}" > /dev/null

   # Put each component in its own go package for compilation performance

   # Strip off the dist folder from each package to flatten the resulting directory structure

   # Force timestamps to unify, and mode to 493 (0755)

-  Godeps/_workspace/bin/go-bindata -nocompress -nometadata -prefix "${CONSOLE_REPO_PATH}/dist"      -pkg "assets" -o "pkg/assets/bindata.go"      "${CONSOLE_REPO_PATH}/dist/..."

-  Godeps/_workspace/bin/go-bindata -nocompress -nometadata -prefix "${CONSOLE_REPO_PATH}/dist.java" -pkg "java"   -o "pkg/assets/java/bindata.go" "${CONSOLE_REPO_PATH}/dist.java/..."

-  

+  "${GOPATH}/bin/go-bindata" -nocompress -nometadata -prefix "${CONSOLE_REPO_PATH}/dist"      -pkg "assets" -o "pkg/assets/bindata.go"      "${CONSOLE_REPO_PATH}/dist/..."

+  "${GOPATH}/bin/go-bindata" -nocompress -nometadata -prefix "${CONSOLE_REPO_PATH}/dist.java" -pkg "java"   -o "pkg/assets/java/bindata.go" "${CONSOLE_REPO_PATH}/dist.java/..."

+

   if [[ -n "${COMMIT:+x}" ]]; then

     if [[ -n "$(git status --porcelain)" ]]; then

       echo "Creating branch and commit..."

@@ -8,7 +8,7 @@ cat <<EOF > ${build_script_path}

 function chown_output {

     if [ ! -z "$OWNER_GROUP" ]; then

-        chown -R "$OWNER_GROUP" Godeps/_workspace/pkg _output

+        chown -R "$OWNER_GROUP" _output

     fi

 }

@@ -182,7 +182,7 @@ popd

 mkdir _thirdpartyhacks

 pushd _thirdpartyhacks

     ln -s \

-        $(dirs +1 -l)/Godeps/_workspace/src/ \

+        $(dirs +1 -l)/vendor/ \

             src

 popd

 export GOPATH=$(pwd)/_build:$(pwd)/_thirdpartyhacks:%{buildroot}%{gopath}:%{gopath}

@@ -56,7 +56,7 @@ func getOrCreateOriginKinds() map[unversioned.GroupVersionKind]bool {

 			// enumerate all supported versions, get the kinds, and register with the mapper how to address our resources

 			for _, version := range Versions {

 				for kind, t := range api.Scheme.KnownTypes(version) {

-					if !strings.Contains(t.PkgPath(), "openshift/origin") {

+					if !strings.Contains(t.PkgPath(), "github.com/openshift/origin") || strings.Contains(t.PkgPath(), "github.com/openshift/origin/vendor/") {

 						continue

 					}

 					gvk := version.WithKind(kind)

@@ -34,7 +34,7 @@ func checkDescriptions(objType reflect.Type, seen *map[reflect.Type]bool, t *tes

 		return

 	}

 	(*seen)[objType] = true

-	if !strings.Contains(objType.PkgPath(), "openshift/origin") {

+	if !strings.Contains(objType.PkgPath(), "github.com/openshift/origin/pkg") {

 		return

 	}

@@ -79,7 +79,7 @@ func checkJsonTags(objType reflect.Type, seen *map[reflect.Type]bool, t *testing

 		return

 	}

 	(*seen)[objType] = true

-	if !strings.Contains(objType.PkgPath(), "openshift/origin") {

+	if !strings.Contains(objType.PkgPath(), "github.com/openshift/origin/pkg") {

 		return

 	}

 	if internalTypesWithAllowedJsonTags.Has(objType.Name()) {

@@ -475,7 +475,7 @@ func TestTypes(t *testing.T) {

 	for internalVersion, externalVersions := range internalVersionToExternalVersions {

 		for kind, reflectType := range kapi.Scheme.KnownTypes(internalVersion) {

-			if !strings.Contains(reflectType.PkgPath(), "/origin/") && reflectType.PkgPath() != "k8s.io/kubernetes/pkg/api" {

+			if !strings.Contains(reflectType.PkgPath(), "github.com/openshift/origin/") && reflectType.PkgPath() != "github.com/openshift/origin/vendor/k8s.io/kubernetes/pkg/api" {

 				continue

 			}

 			if nonInternalRoundTrippableTypes.Has(kind) {

@@ -39,7 +39,7 @@ var MissingValidationExceptions = []reflect.Type{

 func TestCoverage(t *testing.T) {

 	for kind, apiType := range kapi.Scheme.KnownTypes(api.SchemeGroupVersion) {

-		if !strings.Contains(apiType.PkgPath(), "openshift/origin") {

+		if strings.HasPrefix(apiType.PkgPath(), "github.com/openshift/origin/vendor/") {

 			continue

 		}

 		if strings.HasSuffix(kind, "List") {

@@ -89,7 +89,7 @@ func TestDescriberCoverage(t *testing.T) {

 main:

 	for _, apiType := range kapi.Scheme.KnownTypes(api.SchemeGroupVersion) {

-		if !strings.Contains(apiType.PkgPath(), "openshift/origin") {

+		if !strings.HasPrefix(apiType.PkgPath(), "github.com/openshift/origin") || strings.HasPrefix(apiType.PkgPath(), "github.com/openshift/origin/vendor/") {

 			continue

 		}

 		// we don't describe lists

@@ -65,7 +65,7 @@ func TestPrinterCoverage(t *testing.T) {

 main:

 	for _, apiType := range kapi.Scheme.KnownTypes(api.SchemeGroupVersion) {

-		if !strings.Contains(apiType.PkgPath(), "openshift/origin") {

+		if !strings.Contains(apiType.PkgPath(), "github.com/openshift/origin") || strings.Contains(apiType.PkgPath(), "github.com/openshift/origin/vendor/") {

 			continue

 		}

@@ -41,7 +41,7 @@ Extended tests live under the `./test/extended` directory in the origin reposito

 The structure of this directory is following:

 * [**`test/extended/util`**](util) provides useful helpers and utilities to use in your extended test. It provides a easy-to-use interface to OpenShift CLI and also

-access to the Kubernetes [E2E framework](https://github.com/openshift/origin/tree/master/Godeps/_workspace/src/k8s.io/kubernetes/test/e2e) helpers. It also contains OpenShift helpers that are shared across multiple test cases, to make the test cases more DRY.

+access to the Kubernetes [E2E framework](https://github.com/openshift/origin/tree/master/vendor/k8s.io/kubernetes/test/e2e) helpers. It also contains OpenShift helpers that are shared across multiple test cases, to make the test cases more DRY.

 * [**`test/extended/fixtures`**](fixtures) contains the JSON and YAML fixtures that are meant to be used by the extended tests.

 * [**`test/extended/[images,builds,...]`**](builds) each of these Go packages contains extended tests that are related to each other. For example, the `images` directory should contain test cases that are exercising usage of various Docker images in OpenShift.

 * [**`hack/test-extended/[group]/run.sh`**](../../hack/test-extended) is the shell script that sets up any needed dependencies and then launches the extended tests whose top level ginkgo spec's Describe call reference the [group](#groups-vs-packages)

@@ -26,7 +26,7 @@ function os::test::extended::setup {

   # build binaries

   if [[ -z $(os::build::find-binary ginkgo) ]]; then

-    hack/build-go.sh Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo

+    hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo

   fi

   if [[ -z $(os::build::find-binary extended.test) ]]; then

     hack/build-go.sh test/extended/extended.test

@@ -43,7 +43,7 @@ function os::test::extended::setup {

   export EXTENDEDTEST="$(os::build::find-binary extended.test)"

   export TMPDIR=${BASETMPDIR:-/tmp}

   export EXTENDED_TEST_PATH="$(pwd)/test/extended"

-  export KUBE_REPO_ROOT="$(pwd)/Godeps/_workspace/src/k8s.io/kubernetes"

+  export KUBE_REPO_ROOT="$(pwd)/vendor/k8s.io/kubernetes"

   # output tests instead of running

   if [[ -n "${SHOW_ALL:-}" ]]; then