diff --git a/hack/godep-restore.sh b/hack/godep-restore.sh index 3870c1c4e96..ed23e1478ac 100755 --- a/hack/godep-restore.sh +++ b/hack/godep-restore.sh @@ -20,9 +20,10 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -export GOPATH=${GOPATH}:${KUBE_ROOT}/staging -GODEP="${GODEP:-godep}" +source "${KUBE_ROOT}/hack/lib/util.sh" + +kube::util::ensure_godep_version v74 echo "Starting to download all kubernetes godeps. This takes a while" -"${GODEP}" restore "$@" +GOPATH=${GOPATH}:${KUBE_ROOT}/staging godep restore "$@" echo "Download finished" diff --git a/hack/godep-save.sh b/hack/godep-save.sh index 87d017e499b..cc509be7e93 100755 --- a/hack/godep-save.sh +++ b/hack/godep-save.sh @@ -20,9 +20,9 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -export GOPATH=${GOPATH}:${KUBE_ROOT}/staging -GODEP="${GODEP:-godep}" +source "${KUBE_ROOT}/hack/lib/util.sh" +kube::util::ensure_godep_version v74 # Some things we want in godeps aren't code dependencies, so ./... # won't pick them up. @@ -34,8 +34,8 @@ REQUIRED_BINS=( ) pushd "${KUBE_ROOT}" > /dev/null - "${GODEP}" version - GO15VENDOREXPERIMENT=1 ${GODEP} save "${REQUIRED_BINS[@]}" + GOPATH=${GOPATH}:${KUBE_ROOT}/staging godep save "${REQUIRED_BINS[@]}" + # create a symlink in vendor directory pointing to the staging client. This # let other packages use the staging client as if it were vendored. if [ ! -e "vendor/k8s.io/client-go" ]; then diff --git a/hack/update-all.sh b/hack/update-all.sh index c35cddf8f56..e14bf72f964 100755 --- a/hack/update-all.sh +++ b/hack/update-all.sh @@ -20,10 +20,13 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +source "${KUBE_ROOT}/hack/lib/init.sh" +source "${KUBE_ROOT}/hack/lib/util.sh" source "${KUBE_ROOT}/cluster/lib/util.sh" SILENT=true ALL=false +V="" while getopts ":va" opt; do case $opt in @@ -32,6 +35,7 @@ while getopts ":va" opt; do ;; v) SILENT=false + V="-v" ;; \?) echo "Invalid flag: -$OPTARG" >&2 @@ -50,6 +54,13 @@ if ! $ALL ; then echo "Running in short-circuit mode; run with -a to force all scripts to run." fi +kube::util::ensure_godep_version v74 + +if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then + echo "Running godep restore" + "${KUBE_ROOT}/hack/godep-restore.sh" ${V} +fi + BASH_TARGETS=" update-generated-protobuf update-codegen @@ -64,9 +75,8 @@ BASH_TARGETS=" update-staging-godeps update-bazel" -for t in $BASH_TARGETS -do - echo -e "${color_yellow}Running $t${color_norm}" +for t in $BASH_TARGETS; do + echo -e "${color_yellow}Updating $t${color_norm}" if $SILENT ; then if ! bash "$KUBE_ROOT/hack/$t.sh" 1> /dev/null; then echo -e "${color_red}Running $t FAILED${color_norm}"