From ad3e18d60c278f98b19bebb72f9a361e9be07611 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Thu, 10 Mar 2016 13:30:53 -0500 Subject: [PATCH] Stop pinning to version v53 --- docs/devel/development.md | 11 ----------- hack/verify-godeps.sh | 12 ++++++++---- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/docs/devel/development.md b/docs/devel/development.md index 3e782e0311b..1d541520a2a 100644 --- a/docs/devel/development.md +++ b/docs/devel/development.md @@ -196,17 +196,6 @@ export GOPATH=$HOME/go-tools export PATH=$PATH:$GOPATH/bin ``` -Note: -At this time, godep update in the Kubernetes project only works properly if your -version of godep is < 54. - -To check your version of godep: - -```sh -$ godep version -godep v53 (linux/amd64/go1.5.3) -``` - ### Using godep Here's a quick walkthrough of one way to use godeps to add or update a diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index c7da8cc5682..fa35371e400 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -70,10 +70,14 @@ cd "${_kubetmp}" # Build the godep tool go get -u github.com/tools/godep 2>/dev/null GODEP="${GOPATH}/bin/godep" -pushd "${GOPATH}/src/github.com/tools/godep" > /dev/null - git checkout v63 - "${GODEP}" go install -popd > /dev/null +pin-godep() { + pushd "${GOPATH}/src/github.com/tools/godep" > /dev/null + git checkout "$1" + "${GODEP}" go install + popd > /dev/null +} +# Use to following if we ever need to pin godep to a specific version again +#pin-godep 'v63' # Fill out that nice clean place with the kube godeps echo "Starting to download all kubernetes godeps. This takes a while"