github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-21 13:08:00 +00:00
Code Issues Projects Releases Wiki Activity

utils: kata-manager: Fix containerd version check

Browse Source 
Contained release files include the version number without a "v" prefix.
However, the tag for the equivalent release does include it so handle
this distinction and also tighten up the Kata check by specifying an
explicit version number in the regex.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2023-10-26 16:07:33 +01:00
parent 346f195532
commit ae3ea1421d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/kata-manager.sh
View File

@ -143,6 +143,10 @@ github_get_release_file_url()
local url="${1:-}" local url="${1:-}"
local version="${2:-}" local version="${2:-}"
# The version, less any leading 'v'
local version_number
version_number=${version#v}
local arch local arch
arch=$(uname -m) arch=$(uname -m)
[ "$arch" = "x86_64" ] && arch="amd64" [ "$arch" = "x86_64" ] && arch="amd64"
@ -151,11 +155,11 @@ github_get_release_file_url()
case "$url" in case "$url" in
*kata*) *kata*)
regex="kata-static-.*-${arch}.tar.xz" regex="kata-static-${version}-${arch}.tar.xz"
;; ;;
*containerd*) *containerd*)
regex="containerd-.*-linux-${arch}.tar.gz" regex="containerd-${version_number}-linux-${arch}.tar.gz"
;; ;;
*) die "invalid url: '$url'" ;; *) die "invalid url: '$url'" ;;
@ -165,8 +169,10 @@ github_get_release_file_url()
download_url=$(curl -sL "$url" |\ download_url=$(curl -sL "$url" |\
jq --arg version "$version" \ jq --arg version "$version" \
-r '.[] | select(.tag_name == $version) | .assets[].browser_download_url' |\ -r '.[] |
grep "/${regex}$") select( (.tag_name == $version) or (.tag_name == "v" + $version) ) |
.assets[].browser_download_url' |\
grep "/${regex}$")
download_url=$(echo "$download_url" | awk '{print $1}') download_url=$(echo "$download_url" | awk '{print $1}')