github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6751 from nobellium1997/arm-support-gce-configure

Browse Source 
Adding multi-arch support for the configure.sh script
This commit is contained in:
Phil Estes 2022-04-01 15:58:30 -04:00 committed by GitHub
commit 00d951e16a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/gce/configure.sh
View File

@ -126,8 +126,16 @@ else
# TODO(random-liu): Put version into the metadata instead of # TODO(random-liu): Put version into the metadata instead of
# deciding it in cloud init. This may cause issue to reboot test. # deciding it in cloud init. This may cause issue to reboot test.
version=$(curl -f --ipv4 --retry 6 --retry-delay 3 --silent --show-error \ if [ $(uname -m) == "aarch64" ]; then
https://storage.googleapis.com/${deploy_path}/latest) version=$(curl -f --ipv4 --retry 6 --retry-delay 3 --silent --show-error \
-H "Accept: application/vnd.github.v3+json" \
"https://api.github.com/repos/containerd/containerd/releases/latest" \
| jq -r .tag_name \
| sed "s:v::g")
else
version=$(curl -f --ipv4 --retry 6 --retry-delay 3 --silent --show-error \
https://storage.googleapis.com/${deploy_path}/latest)
fi
fi fi
TARBALL_GCS_NAME="${pkg_prefix}-${version}.linux-amd64.tar.gz" TARBALL_GCS_NAME="${pkg_prefix}-${version}.linux-amd64.tar.gz"
@ -148,7 +156,12 @@ if [ -z "${version}" ]; then
exit 1 exit 1
fi fi
else else
if is_preloaded "${TARBALL_GCS_NAME}" "${tar_sha1}"; then if [ $(uname -m) == "aarch64" ]; then
curl -f --ipv4 -Lo "${TARBALL}" --connect-timeout 20 --max-time 300 --retry 6 --retry-delay 10 \
"https://github.com/containerd/containerd/releases/download/v${version}/cri-containerd-${version}-linux-arm64.tar.gz"
tar xvf "${TARBALL}"
rm -f "${TARBALL}"
elif is_preloaded "${TARBALL_GCS_NAME}" "${tar_sha1}"; then
echo "${TARBALL_GCS_NAME} is preloaded" echo "${TARBALL_GCS_NAME} is preloaded"
else else
# Download and untar the release tar ball. # Download and untar the release tar ball.