diff --git a/README.md b/README.md index 2c35deae0..08351149e 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,9 @@ The [Helm roadmap is currently located on the wiki](https://github.com/kubernete You can reach the Helm community and developers via the following channels: -- [Kubernetes Slack](https://slack.k8s.io): #helm +- [Kubernetes Slack](https://slack.k8s.io): + - #helm-users + - #helm-dev - Mailing List: https://groups.google.com/forum/#!forum/kubernetes-sig-apps - Developer Call: Thursdays at 9:30-10:00 Pacific. [https://zoom.us/j/4526666954](https://zoom.us/j/4526666954) diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index 93ac7d1ae..2f193936e 100644 --- a/cmd/tiller/tiller.go +++ b/cmd/tiller/tiller.go @@ -221,7 +221,7 @@ func tlsOptions() tlsutil.Options { opts := tlsutil.Options{CertFile: certFile, KeyFile: keyFile} if tlsVerify { opts.CaCertFile = caCertFile - opts.ClientAuth = tls.RequireAndVerifyClientCert + opts.ClientAuth = tls.VerifyClientCertIfGiven } return opts } diff --git a/scripts/get b/scripts/get index 73266f373..a52a0a9a1 100755 --- a/scripts/get +++ b/scripts/get @@ -64,12 +64,16 @@ verifySupported() { # checkLatestVersion checks the latest available version. checkLatestVersion() { - # Use the GitHub API to find the latest version for this project. - local latest_url="https://api.github.com/repos/kubernetes/helm/releases/latest" + # Use the GitHub releases webpage for the project to find the latest version for this project. + local latest_url="https://github.com/kubernetes/helm/releases/latest" if type "curl" > /dev/null; then - TAG=$(curl -s $latest_url | awk '/\"tag_name\":/{gsub( /[,\"]/,"", $2); print $2}') + TAG=$(curl -SsL $latest_url | awk '/\/tag\//' | head -n 1 | cut -d '"' -f 2 | awk '{n=split($NF,a,"/");print a[n]}') elif type "wget" > /dev/null; then - TAG=$(wget -q -O - $latest_url | awk '/\"tag_name\":/{gsub( /[,\"]/,"", $2); print $2}') + TAG=$(wget -q -O - $latest_url | awk '/\/tag\//' | head -n 1 | cut -d '"' -f 2 | awk '{n=split($NF,a,"/");print a[n]}') + fi + if [ "x$TAG" == "x" ]; then + echo "Cannot determine latest tag." + exit 1 fi } @@ -100,12 +104,12 @@ downloadFile() { HELM_SUM_FILE="/tmp/$HELM_DIST.sha256" echo "Downloading $DOWNLOAD_URL" if type "curl" > /dev/null; then - curl -Ls "$CHECKSUM_URL" -o "$HELM_SUM_FILE" + curl -SsL "$CHECKSUM_URL" -o "$HELM_SUM_FILE" elif type "wget" > /dev/null; then wget -q -O "$HELM_SUM_FILE" "$CHECKSUM_URL" fi if type "curl" > /dev/null; then - curl -L "$DOWNLOAD_URL" -o "$HELM_TMP_FILE" + curl -SsL "$DOWNLOAD_URL" -o "$HELM_TMP_FILE" elif type "wget" > /dev/null; then wget -q -O "$HELM_TMP_FILE" "$DOWNLOAD_URL" fi @@ -134,7 +138,7 @@ fail_trap() { result=$? if [ "$result" != "0" ]; then echo "Failed to install $PROJECT_NAME" - echo "\tFor support, go to https://github.com/kubernetes/helm." + echo -e "\tFor support, go to https://github.com/kubernetes/helm." fi exit $result }