From 78ed3891221b40b42f50e31a8ebd4f2aecb68db7 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Tue, 30 Jan 2018 07:45:25 -0800 Subject: [PATCH] Remove unneeded code --- hack/godep-restore.sh | 1 - hack/verify-godeps.sh | 24 ------------------------ 2 files changed, 25 deletions(-) diff --git a/hack/godep-restore.sh b/hack/godep-restore.sh index aaee1b0ca3d..5da18d8f089 100755 --- a/hack/godep-restore.sh +++ b/hack/godep-restore.sh @@ -20,7 +20,6 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -source "${KUBE_ROOT}/hack/lib/util.sh" kube::log::status "Restoring kubernetes godeps" diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index 91731ec8aaa..92f979ba159 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -18,30 +18,6 @@ set -o errexit set -o nounset set -o pipefail -# As of go 1.6, the vendor experiment is enabled by default. -export GO15VENDOREXPERIMENT=1 - -#### HACK #### -# Sometimes godep just can't handle things. This lets use manually put -# some deps in place first, so godep won't fall over. -preload-dep() { - org="$1" - project="$2" - sha="$3" - # project_dir ($4) is optional, if unset we will generate it - if [[ -z ${4:-} ]]; then - project_dir="${GOPATH}/src/${org}/${project}.git" - else - project_dir="${4}" - fi - - echo "**HACK** preloading dep for ${org} ${project} at ${sha} into ${project_dir}" - git clone "https://${org}/${project}" "${project_dir}" > /dev/null 2>&1 - pushd "${project_dir}" > /dev/null - git checkout "${sha}" - popd > /dev/null -} - KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh"