Add binary skip option

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/6130/head
Derek Nola 2022-09-13 11:12:41 -07:00
parent e31e6d6d8e
commit 71b7e9f763
1 changed files with 5 additions and 5 deletions

View File

@ -269,13 +269,13 @@ setup_env() {
}
# --- check if skip download environment variable set ---
can_skip_download() {
if [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != true ]; then
can_skip_download_binary() {
if [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != true ] && [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != "binary" ]; then
return 1
fi
}
can_skip_selinux_download() {
can_skip_download_selinux() {
if [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != true ] && [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != "selinux" ]; then
return 1
fi
@ -489,7 +489,7 @@ setup_selinux() {
${package_installer} install -y https://${rpm_site}/k3s/${rpm_channel}/common/${rpm_site_infix}/noarch/k3s-selinux-0.4-1.${rpm_target}.noarch.rpm
"
if [ "$INSTALL_K3S_SKIP_SELINUX_RPM" = true ] || can_skip_selinux_download || [ ! -d /usr/share/selinux ]; then
if [ "$INSTALL_K3S_SKIP_SELINUX_RPM" = true ] || can_skip_download_selinux || [ ! -d /usr/share/selinux ]; then
info "Skipping installation of SELinux RPM"
elif [ "${ID_LIKE:-}" != coreos ] && [ "${VARIANT_ID:-}" != coreos ]; then
install_selinux_rpm ${rpm_site} ${rpm_channel} ${rpm_target} ${rpm_site_infix}
@ -558,7 +558,7 @@ EOF
# --- download and verify k3s ---
download_and_verify() {
if can_skip_download; then
if can_skip_download_binary; then
info 'Skipping k3s download and verify'
verify_k3s_is_executable
return