Merge pull request #88916 from dims/use-go-bin-data-from-vendor

Use go-bindata built from vendor/
This commit is contained in:
Kubernetes Prow Robot 2020-03-07 06:31:34 -08:00 committed by GitHub
commit e71ff9e5e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -28,14 +28,12 @@ if [[ ! -d "${KUBE_ROOT}/pkg" ]]; then
exit 1
fi
# kube::golang::build_kube_toolchain installs the vendored go-bindata in
# $GOPATH/bin, so make sure that's explicitly part of our $PATH.
export PATH="${KUBE_OUTPUT_BINPATH}:${PATH}"
# Ensure that we find the binaries we build before anything else.
export GOBIN="${KUBE_OUTPUT_BINPATH}"
PATH="${GOBIN}:${PATH}"
if ! which go-bindata &>/dev/null ; then
echo "Cannot find go-bindata."
exit 5
fi
# Install tools we need, but only from vendor/...
go install k8s.io/kubernetes/vendor/github.com/go-bindata/go-bindata/...
# run the generation from the root directory for stable output
pushd "${KUBE_ROOT}" >/dev/null