Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 13 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,17 @@ set -o noglob
# If set to true will not start k3s service.
#
# - INSTALL_K3S_VERSION
# Version of k3s to download from github. Will attempt to download from the
# Version of k3s to download. Will attempt to download from the
# stable channel if not specified.
#
# - INSTALL_K3S_COMMIT
# Commit of k3s to download from temporary cloud storage.
# * (for developer & QA use)
#
# - INSTALL_K3S_ARTIFACT_URL
# URL prefix for K3s release artifacts.
# Default is https://github.com/k3s-io/k3s/releases/download
#
# - INSTALL_K3S_PR
# PR build of k3s to download from Github Artifacts.
# * (for developer & QA use)
Expand Down Expand Up @@ -95,7 +99,7 @@ set -o noglob
# Channel to use for fetching k3s download URL.
# Defaults to 'stable'.

Comment thread
manuelbuil marked this conversation as resolved.
GITHUB_URL=${GITHUB_URL:-https://github.com/k3s-io/k3s/releases}
INSTALL_K3S_ARTIFACT_URL=${INSTALL_K3S_ARTIFACT_URL:-https://github.com/k3s-io/k3s/releases/download}
GITHUB_ART_URL=""
Comment thread
manuelbuil marked this conversation as resolved.
DOWNLOADER=
Comment thread
manuelbuil marked this conversation as resolved.

Expand Down Expand Up @@ -378,6 +382,7 @@ get_release_version() {
;;
esac
fi
VERSION_URLSAFE="$(printf '%s' "${VERSION_K3S}" | sed 's/+/%2B/g')"
info "Using ${VERSION_K3S} as release"
}

Expand Down Expand Up @@ -460,7 +465,7 @@ download_hash() {
curl -s -o ${TMP_ZIP} -H "Authorization: Bearer $GITHUB_TOKEN" -L ${GITHUB_ART_URL}
unzip -p ${TMP_ZIP} k3s.sha256sum > ${TMP_HASH}
else
HASH_URL=${GITHUB_URL}/download/${VERSION_K3S}/sha256sum-${ARCH}.txt
HASH_URL=${INSTALL_K3S_ARTIFACT_URL}/${VERSION_URLSAFE}/sha256sum-${ARCH}.txt
info "Downloading hash ${HASH_URL}"
download ${TMP_HASH} ${HASH_URL}
fi
Expand Down Expand Up @@ -552,7 +557,7 @@ download_binary() {
unzip -p ${TMP_ZIP} k3s > ${TMP_BIN}
return
else
BIN_URL=${GITHUB_URL}/download/${VERSION_K3S}/k3s${SUFFIX}
BIN_URL=${INSTALL_K3S_ARTIFACT_URL}/${VERSION_URLSAFE}/k3s${SUFFIX}
fi
info "Downloading binary ${BIN_URL}"
download ${TMP_BIN} ${BIN_URL}
Expand Down Expand Up @@ -758,6 +763,10 @@ download_and_verify() {
verify_downloader curl || verify_downloader wget || fatal 'Can not find curl or wget for downloading files'
setup_tmp
get_release_version
# GITHUB_URL was replaced by INSTALL_K3S_ARTIFACT_URL
if [ -n "$GITHUB_URL" ]; then
warn "GITHUB_URL does not work anymore. Please use 'INSTALL_K3S_ARTIFACT_URL' instead."
fi
download_hash

if installed_hash_matches; then
Expand Down
2 changes: 1 addition & 1 deletion install.sh.sha256sum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f6dd79c73ff9823378e92cfc0855e725e5dea26c91e2b0c3f80d1d59c05d5f02 install.sh
448f9207d4d566066269d5f8950a457aced691aadf9d455a98dfd1dc1b75bef3 install.sh