Merge pull request #78018 from sttts/sttts-go-tools-nm

Fix broken hack/verify-symbols.sh
k3s-v1.15.3
Kubernetes Prow Robot 2019-05-24 05:52:22 -07:00 committed by GitHub
commit 914f80d671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions

View File

@ -23,7 +23,15 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env
make -C "${KUBE_ROOT}" WHAT=cmd/hyperkube
kube::util::ensure-temp-dir
OUTPUT="${KUBE_TEMP}"/symbols-output
cleanup() {
rm -rf "${OUTPUT}"
}
trap "cleanup" EXIT SIGINT
mkdir -p "${OUTPUT}"
GOLDFLAGS="-w" make -C "${KUBE_ROOT}" WHAT=cmd/hyperkube
# Add other BADSYMBOLS here.
BADSYMBOLS=(
@ -31,14 +39,20 @@ BADSYMBOLS=(
"testify"
"testing[.]"
"TestOnlySetFatalOnDecodeError"
"TrackStorageCleanup"
)
# b/c hyperkube binds everything simply check that for bad symbols
SYMBOLS="$(nm "${KUBE_OUTPUT_HOSTBIN}/hyperkube")"
go tool nm "${KUBE_OUTPUT_HOSTBIN}/hyperkube" > "${OUTPUT}/hyperkube-symbols"
if ! grep -q "NewHyperKubeCommand" "${OUTPUT}/hyperkube-symbols"; then
echo "No symbols found in hyperkube binary."
exit 1
fi
RESULT=0
for BADSYMBOL in "${BADSYMBOLS[@]}"; do
if FOUND=$(echo "$SYMBOLS" | grep "$BADSYMBOL"); then
if FOUND=$(grep "${BADSYMBOL}" < "${OUTPUT}/hyperkube-symbols"); then
echo "Found bad symbol '${BADSYMBOL}':"
echo "$FOUND"
RESULT=1