Merge pull request #108034 from tstapler/critools_arm_configuresh

Add crit-tools arm64 sha512 hash to configure.sh
This commit is contained in:
Kubernetes Prow Robot 2022-02-17 17:20:41 -08:00 committed by GitHub
commit 344bf270ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,7 +31,8 @@ DEFAULT_NPD_HASH_AMD64='4919c47447c5f3871c1dc3171bbb817a38c8c8d07a6ce55a77d43cad
# TODO (SergeyKanzhelev): fill up for npd 0.8.9+
DEFAULT_NPD_HASH_ARM64='8ccb42a862efdfc1f25ca9a22f3fd36f9fdff1ac618dd7d39e3b5991505dd610d432364420896ad71f42197a116f28a85dde58b129baa075ebb7312caa57f852'
DEFAULT_CRICTL_VERSION='v1.23.0'
DEFAULT_CRICTL_SHA512='f8c40c66c8d9a85e857399506f4977564890815b02658eec591114e04bd8bc6b8ea08bcc159af0088b5eda7bf0dfd16096bf0c174819c204193fb7343ae7d9d5'
DEFAULT_CRICTL_AMD64_SHA512='f8c40c66c8d9a85e857399506f4977564890815b02658eec591114e04bd8bc6b8ea08bcc159af0088b5eda7bf0dfd16096bf0c174819c204193fb7343ae7d9d5'
DEFAULT_CRICTL_ARM64_SHA512='261ac360b0ac3fc88c81f1cc348f84b0df0b07ca4db61b0e647c142882d129ba11d21d0de373a27ecfd984436a08a11b19cde2ad5e3412e5d03203caedd62d92'
DEFAULT_MOUNTER_TAR_SHA='7956fd42523de6b3107ddc3ce0e75233d2fcb78436ff07a1389b6eaac91fb2b1b72a08f7a219eaf96ba1ca4da8d45271002e0d60e0644e796c665f99bb356516'
###
@ -262,24 +263,29 @@ function install-gci-mounter-tools {
# Install node problem detector binary.
function install-node-problem-detector {
if [[ "${HOST_ARCH}" == "amd64" ]]; then
DEFAULT_NPD_HASH=${DEFAULT_NPD_HASH_AMD64}
elif [[ "${HOST_ARCH}" == "arm64" ]]; then
DEFAULT_NPD_HASH=${DEFAULT_NPD_HASH_ARM64}
else
# no other architectures are supported currently.
# Assumption is that this script only runs on linux,
# see cluster/gce/windows/k8s-node-setup.psm1 for windows
# https://github.com/kubernetes/node-problem-detector/releases/
DEFAULT_NPD_HASH='N/A'
fi
if [[ -n "${NODE_PROBLEM_DETECTOR_VERSION:-}" ]]; then
local -r npd_version="${NODE_PROBLEM_DETECTOR_VERSION}"
local -r npd_hash="${NODE_PROBLEM_DETECTOR_TAR_HASH}"
else
local -r npd_version="${DEFAULT_NPD_VERSION}"
local -r npd_hash="${DEFAULT_NPD_HASH}"
case "${HOST_PLATFORM}/${HOST_ARCH}" in
linux/amd64)
local -r npd_hash="${DEFAULT_NPD_HASH_AMD64}"
;;
linux/arm64)
local -r npd_hash="${DEFAULT_NPD_HASH_ARM64}"
;;
# no other architectures are supported currently.
# Assumption is that this script only runs on linux,
# see cluster/gce/windows/k8s-node-setup.psm1 for windows
# https://github.com/kubernetes/node-problem-detector/releases/
*)
echo "Unrecognized version and platform/arch combination:"
echo "$DEFAULT_NPD_VERSION $HOST_PLATFORM/$HOST_ARCH"
echo "Set NODE_PROBLEM_DETECTOR_VERSION and NODE_PROBLEM_DETECTOR_TAR_HASH to overwrite"
exit 1
;;
esac
fi
local -r npd_tar="node-problem-detector-${npd_version}-${HOST_PLATFORM}_${HOST_ARCH}.tar.gz"
@ -334,7 +340,19 @@ function install-crictl {
local -r crictl_hash="${CRICTL_TAR_HASH}"
else
local -r crictl_version="${DEFAULT_CRICTL_VERSION}"
local -r crictl_hash="${DEFAULT_CRICTL_SHA512}"
case "${HOST_PLATFORM}/${HOST_ARCH}" in
linux/amd64)
local -r crictl_hash="${DEFAULT_CRICTL_AMD64_SHA512}"
;;
linux/arm64)
local -r crictl_hash="${DEFAULT_CRICTL_ARM64_SHA512}"
;;
*)
echo "Unrecognized version and platform/arch combination:"
echo "$DEFAULT_CRICTL_VERSION $HOST_PLATFORM/$HOST_ARCH"
echo "Set CRICTL_VERSION and CRICTL_TAR_HASH to overwrite"
exit 1
esac
fi
local -r crictl="crictl-${crictl_version}-${HOST_PLATFORM}-${HOST_ARCH}.tar.gz"