github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 09:52:49 +00:00
Code Issues Projects Releases Wiki Activity

make download-or-bust compatible with both sha512/sha1

Browse Source
This commit is contained in:
Shihang Zhang 2020-10-06 15:15:55 -07:00
parent 558429967a
commit e0dcfbf9c2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/gce/gci/configure.sh
View File

@ -126,9 +126,10 @@ function validate-hash {
local -r file="$1"
local -r expected="$2"
actual=$(sha512sum ${file} | awk '{ print $1 }') || true
if [[ "${actual}" != "${expected}" ]]; then
echo "== ${file} corrupted, sha512 ${actual} doesn't match expected ${expected} =="
actual_sha1=$(sha1sum "${file}" | awk '{ print $1 }') || true
actual_sha512=$(sha512sum "${file}" | awk '{ print $1 }') || true
if [[ "${actual_sha1}" != "${expected}" ]] && [[ "${actual_sha512}" != "${expected}" ]]; then
echo "== ${file} corrupted, sha1 ${actual_sha1}/sha512 ${actual_sha512} doesn't match expected ${expected} =="
return 1
fi
}
@ -146,7 +147,7 @@ function valid-storage-scope {
# Retry a download until we get it. Takes a hash and a set of URLs.
#
# $1 is the sha512 of the URL. Can be "" if the sha512 is unknown.
# $1 is the sha512/sha1 hash of the URL. Can be "" if the sha512/sha1 hash is unknown.
# $2+ are the URLs to download.
function download-or-bust {
local -r hash="$1"
@ -168,7 +169,7 @@ function download-or-bust {
echo "== Hash validation of ${url} failed. Retrying. =="
else
if [[ -n "${hash}" ]]; then
echo "== Downloaded ${url} (SHA512 = ${hash}) =="
echo "== Downloaded ${url} (HASH = ${hash}) =="
else
echo "== Downloaded ${url} =="
fi