Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.6.33 is not available on centos/ol/rhel 8 #5282

Merged
merged 2 commits into from
Jul 31, 2024
Merged

1.6.33 is not available on centos/ol/rhel 8 #5282

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfff3f0
1.6.33 is not available on centos/ol/rhel 8
laverya Jul 31, 2024
4672d36
fix *8 override
laverya Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions addons/containerd/template/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,20 @@ function find_common_versions() {
# Get the union of versions available for all operating systems
local ALL_VERSIONS=("${CENTOS8_VERSIONS[@]}" "${RHEL9_VERSIONS[@]}" "${UBUNTU16_VERSIONS[@]}" "${UBUNTU18_VERSIONS[@]}" "${UBUNTU20_VERSIONS[@]}" "${UBUNTU22_VERSIONS[@]}")
ALL_VERSIONS=($(echo "${ALL_VERSIONS[@]}" | tr ' ' '\n' | sort -rV | uniq -d | tr '\n' ' ')) # remove duplicates
ALL_VERSIONS=($(echo "${ALL_VERSIONS[@]}" | tr ' ' '\n' | grep -vE '1\.7\.' | tr '\n' ' ')) # remove 7.x versions

for version in ${ALL_VERSIONS[@]}; do
init_preflight_file $version
init_manifest_file $version

if ! contains "$version" ${CENTOS8_VERSIONS[*]}; then
echo "CentOS 8 lacks version $version"
add_unsupported_os_to_preflight_file "$version" "centos" "8"
add_unsupported_os_to_preflight_file "$version" "rhel" "8"
add_unsupported_os_to_preflight_file "$version" "ol" "8"
echo "Rocky 8 lacks version $version, using ${CENTOS8_VERSIONS[0]} instead"
add_override_os_to_preflight_file "$version" "${CENTOS8_VERSIONS[0]}" "centos" "8"
add_override_os_to_preflight_file "$version" "${CENTOS8_VERSIONS[0]}" "rhel" "8"
add_override_os_to_preflight_file "$version" "${CENTOS8_VERSIONS[0]}" "ol" "8"
add_override_os_to_manifest_file "$version" "${CENTOS8_VERSIONS[0]}" "centos" "Dockerfile.centos8"
add_override_os_to_manifest_file "$version" "${CENTOS8_VERSIONS[0]}" "rhel" "Dockerfile.centos8"
add_override_os_to_manifest_file "$version" "${CENTOS8_VERSIONS[0]}" "ol" "Dockerfile.centos8"
else
add_supported_os_to_preflight_file "$version" "centos" "8"
add_supported_os_to_preflight_file "$version" "rhel" "8"
Expand All @@ -216,35 +220,35 @@ function find_common_versions() {

if ! contains "$version" ${UBUNTU16_VERSIONS[*]}; then
echo "Ubuntu 16 lacks version $version"
add_unsupported_os_to_preflight_file $version "ubuntu" "16.04"
add_unsupported_os_to_preflight_file "$version" "ubuntu" "16.04"
else
add_supported_os_to_preflight_file $version "ubuntu" "16.04"
add_supported_os_to_manifest_file $version "ubuntu-16.04" "Dockerfile.ubuntu16"
add_supported_os_to_preflight_file "$version" "ubuntu" "16.04"
add_supported_os_to_manifest_file "$version" "ubuntu-16.04" "Dockerfile.ubuntu16"
fi

if ! contains "$version" ${UBUNTU18_VERSIONS[*]}; then
echo "Ubuntu 18 lacks version $version, using ${UBUNTU18_VERSIONS[0]} instead"
add_override_os_to_preflight_file $version "${UBUNTU18_VERSIONS[0]}" "ubuntu" "18.04"
add_override_os_to_manifest_file $version "${UBUNTU18_VERSIONS[0]}" "ubuntu-18.04" "Dockerfile.ubuntu18"
add_override_os_to_preflight_file "$version" "${UBUNTU18_VERSIONS[0]}" "ubuntu" "18.04"
add_override_os_to_manifest_file "$version" "${UBUNTU18_VERSIONS[0]}" "ubuntu-18.04" "Dockerfile.ubuntu18"
else
add_supported_os_to_preflight_file $version "ubuntu" "18.04"
add_supported_os_to_manifest_file $version "ubuntu-18.04" "Dockerfile.ubuntu18"
add_supported_os_to_preflight_file "$version" "ubuntu" "18.04"
add_supported_os_to_manifest_file "$version" "ubuntu-18.04" "Dockerfile.ubuntu18"
fi

if ! contains "$version" ${UBUNTU20_VERSIONS[*]}; then
echo "Ubuntu 20 lacks version $version"
add_unsupported_os_to_preflight_file $version "ubuntu" "20.04"
add_unsupported_os_to_preflight_file "$version" "ubuntu" "20.04"
else
add_supported_os_to_preflight_file $version "ubuntu" "20.04"
add_supported_os_to_manifest_file $version "ubuntu-20.04" "Dockerfile.ubuntu20"
add_supported_os_to_preflight_file "$version" "ubuntu" "20.04"
add_supported_os_to_manifest_file "$version" "ubuntu-20.04" "Dockerfile.ubuntu20"
fi

if ! contains "$version" ${UBUNTU22_VERSIONS[*]}; then
echo "Ubuntu 22 lacks version $version"
add_unsupported_os_to_preflight_file $version "ubuntu" "22.04"
add_unsupported_os_to_preflight_file "$version" "ubuntu" "22.04"
else
add_supported_os_to_preflight_file $version "ubuntu" "22.04"
add_supported_os_to_manifest_file $version "ubuntu-22.04" "Dockerfile.ubuntu22"
add_supported_os_to_preflight_file "$version" "ubuntu" "22.04"
add_supported_os_to_manifest_file "$version" "ubuntu-22.04" "Dockerfile.ubuntu22"
fi

VERSIONS+=("$version")
Expand Down
Loading