Unverified Commit 55ab4b86 authored by Matthew Fisher's avatar Matthew Fisher Committed by GitHub
Browse files

Merge pull request #2986 from goostleek/bug/installation-script-fix

Installation shell script fix
parents 78d6b930 9a42d718
main Release add-codeql dependabot/go_modules/github.com/docker/distribution-2.8.2incompatible dependabot/go_modules/github.com/lib/pq-1.10.9 dependabot/go_modules/github.com/rubenv/sql-migrate-1.4.0 dependabot/go_modules/golang.org/x/crypto-0.9.0 dependabot/go_modules/golang.org/x/term-0.8.0 dependabot/go_modules/k8s.io/klog/v2-2.100.1 dev-v2 feat-v3/event-emitter-lua release-2.10 release-2.11 release-2.12 release-2.13 release-2.14 release-2.15 release-2.16 release-2.17 release-2.8 release-2.9 release-3.0 release-3.1 release-3.10 release-3.11 release-3.12 release-3.2 release-3.3 release-3.4 release-3.5 release-3.6 release-3.6.1 release-3.6.2 release-3.7 release-3.8 release-3.9 release-v3.0.0-beta.4 v3.12.0 v3.12.0-rc.1 v3.12.0-dev.1 v3.11.3 v3.11.2 v3.11.1 v3.11.0 v3.11.0-rc.2 v3.11.0-rc.1 v3.10.3 v3.10.2 v3.10.1 v3.10.0 v3.10.0-rc.1 v3.9.4 v3.9.3 v3.9.2 v3.9.1 v3.9.0 v3.9.0-rc.1 v3.8.2 v3.8.1 v3.8.0 v3.8.0-rc.2 v3.8.0-rc.1 v3.7.2 v3.7.1 v3.7.0 v3.7.0-rc.3 v3.7.0-rc.2 v3.7.0-rc.1 v3.6.3 v3.6.2 v3.6.1 v3.6.0 v3.6.0-rc.1 v3.5.4 v3.5.3 v3.5.2 v3.5.1 v3.5.0 v3.5.0-rc.2 v3.5.0-rc.1 v3.4.2 v3.4.1 v3.4.0 v3.4.0-rc.1 v3.3.4 v3.3.3 v3.3.2 v3.3.1 v3.3.0 v3.3.0-rc.2 v3.3.0-rc.1 v3.2.4 v3.2.3 v3.2.2 v3.2.1 v3.2.0 v3.2.0-rc.1 v3.1.3 v3.1.2 v3.1.1 v3.1.0 v3.1.0-rc.3 v3.1.0-rc.2 v3.1.0-rc.1 v3.0.3 v3.0.2 v3.0.1 v3.0.0 v3.0.0-rc.4 v3.0.0-rc.3 v3.0.0-rc.2 v3.0.0-rc.1 v3.0.0-beta.5 v3.0.0-beta.4 v3.0.0-beta.3 v3.0.0-beta.2 v3.0.0-beta.1 v3.0.0-alpha.2 v3.0.0-alpha.1 v2.17.0 v2.17.0-rc.1 v2.16.12 v2.16.11 v2.16.10 v2.16.9 v2.16.8 v2.16.7 v2.16.6 v2.16.5 v2.16.4 v2.16.3 v2.16.2 v2.16.1 v2.16.0 v2.16.0-rc.2 v2.16.0-rc.1 v2.15.2 v2.15.1 v2.15.0 v2.15.0-rc.2 v2.15.0-rc.1 v2.14.3 v2.14.2 v2.14.1 v2.14.0 v2.14.0-rc.2 v2.14.0-rc.1 v2.13.1 v2.13.1-rc.1 v2.13.0 v2.13.0-rc.2 v2.13.0-rc.1 v2.12.3 v2.12.2 v2.12.1 v2.12.0 v2.12.0-rc.2 v2.12.0-rc.1 v2.11.0 v2.11.0-rc.4 v2.11.0-rc.3 v2.11.0-rc.2 v2.11.0-rc.1 v2.10.0 v2.10.0-rc.3 v2.10.0-rc.2 v2.10.0-rc.1 v2.9.1 v2.9.0 v2.9.0-rc5 v2.9.0-rc4 v2.9.0-rc3 v2.9.0-rc2 v2.9.0-rc1 v2.8.2 v2.8.2-rc1 v2.8.1 v2.8.0 v2.8.0-rc.1
No related merge requests found
Showing with 12 additions and 4 deletions
+12 -4
...@@ -111,8 +111,9 @@ downloadFile() { ...@@ -111,8 +111,9 @@ downloadFile() {
HELM_DIST="helm-$TAG-$OS-$ARCH.tar.gz" HELM_DIST="helm-$TAG-$OS-$ARCH.tar.gz"
DOWNLOAD_URL="https://kubernetes-helm.storage.googleapis.com/$HELM_DIST" DOWNLOAD_URL="https://kubernetes-helm.storage.googleapis.com/$HELM_DIST"
CHECKSUM_URL="$DOWNLOAD_URL.sha256" CHECKSUM_URL="$DOWNLOAD_URL.sha256"
HELM_TMP_FILE="/tmp/$HELM_DIST" HELM_TMP_ROOT="$(mktemp -dt helm-installer-XXXXXX)"
HELM_SUM_FILE="/tmp/$HELM_DIST.sha256" HELM_TMP_FILE="$HELM_TMP_ROOT/$HELM_DIST"
HELM_SUM_FILE="$HELM_TMP_ROOT/$HELM_DIST.sha256"
echo "Downloading $DOWNLOAD_URL" echo "Downloading $DOWNLOAD_URL"
if type "curl" > /dev/null; then if type "curl" > /dev/null; then
curl -SsL "$CHECKSUM_URL" -o "$HELM_SUM_FILE" curl -SsL "$CHECKSUM_URL" -o "$HELM_SUM_FILE"
...@@ -129,7 +130,7 @@ downloadFile() { ...@@ -129,7 +130,7 @@ downloadFile() {
# installFile verifies the SHA256 for the file, then unpacks and # installFile verifies the SHA256 for the file, then unpacks and
# installs it. # installs it.
installFile() { installFile() {
HELM_TMP="/tmp/$PROJECT_NAME" HELM_TMP="$HELM_TMP_ROOT/$PROJECT_NAME"
local sum=$(openssl sha1 -sha256 ${HELM_TMP_FILE} | awk '{print $2}') local sum=$(openssl sha1 -sha256 ${HELM_TMP_FILE} | awk '{print $2}')
local expected_sum=$(cat ${HELM_SUM_FILE}) local expected_sum=$(cat ${HELM_SUM_FILE})
if [ "$sum" != "$expected_sum" ]; then if [ "$sum" != "$expected_sum" ]; then
...@@ -156,6 +157,7 @@ fail_trap() { ...@@ -156,6 +157,7 @@ fail_trap() {
fi fi
echo -e "\tFor support, go to https://github.com/kubernetes/helm." echo -e "\tFor support, go to https://github.com/kubernetes/helm."
fi fi
cleanup
exit $result exit $result
} }
...@@ -180,6 +182,11 @@ help () { ...@@ -180,6 +182,11 @@ help () {
echo -e "\te.g. --version v2.4.0 or -v latest" echo -e "\te.g. --version v2.4.0 or -v latest"
} }
# cleanup temporary files to avoid https://github.com/kubernetes/helm/issues/2977
cleanup() {
rm -rf "$HELM_TMP_ROOT"
}
# Execution # Execution
#Stop execution on any error #Stop execution on any error
...@@ -200,7 +207,7 @@ while [[ $# -gt 0 ]]; do ...@@ -200,7 +207,7 @@ while [[ $# -gt 0 ]]; do
exit 0 exit 0
fi fi
;; ;;
'--help'|-h) '--help'|-h)
help help
exit 0 exit 0
;; ;;
...@@ -220,3 +227,4 @@ if ! checkHelmInstalledVersion; then ...@@ -220,3 +227,4 @@ if ! checkHelmInstalledVersion; then
installFile installFile
fi fi
testVersion testVersion
cleanup
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment