From d7240ff9430e31fa950e27fe5aa7a60edc3d99bf Mon Sep 17 00:00:00 2001 From: fibonacci1729 Date: Fri, 21 Apr 2017 09:34:26 -0600 Subject: [PATCH 1/6] fix(tiller): update tls client auth policy RequireAndVerifyClientCert => VerifyClientCertIfGiven Closes #2310 --- cmd/tiller/tiller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } From 037ff5b51c593c3d23c6f2fc83bc95630e10dc31 Mon Sep 17 00:00:00 2001 From: Jorge Marin Date: Mon, 24 Apr 2017 10:29:01 +0000 Subject: [PATCH 2/6] Replace call to Github HTTP API with normal Github URL --- scripts/get | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/get b/scripts/get index 73266f373..812d1b275 100755 --- a/scripts/get +++ b/scripts/get @@ -65,11 +65,15 @@ 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" + 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 } From e114807c453d2e63e5234c70beb39a37f285cd73 Mon Sep 17 00:00:00 2001 From: Jorge Marin Date: Mon, 24 Apr 2017 10:29:59 +0000 Subject: [PATCH 3/6] Use '-SsL' for all 'curl' calls to get response using SSL, silently and following reedirections --- scripts/get | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/get b/scripts/get index 812d1b275..4c2e912da 100755 --- a/scripts/get +++ b/scripts/get @@ -104,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 From 6adf7d59dea439e81f50a88d35764e47f7fcf012 Mon Sep 17 00:00:00 2001 From: Jorge Marin Date: Mon, 24 Apr 2017 10:30:29 +0000 Subject: [PATCH 4/6] Print escaped chars --- scripts/get | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get b/scripts/get index 4c2e912da..aabdedc68 100755 --- a/scripts/get +++ b/scripts/get @@ -138,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 } From 18fc8a853911c4fdbd068628496fb081279fb273 Mon Sep 17 00:00:00 2001 From: Jorge Marin Date: Tue, 25 Apr 2017 08:26:22 +0000 Subject: [PATCH 5/6] Update comment in function --- scripts/get | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get b/scripts/get index aabdedc68..a52a0a9a1 100755 --- a/scripts/get +++ b/scripts/get @@ -64,7 +64,7 @@ verifySupported() { # checkLatestVersion checks the latest available version. checkLatestVersion() { - # Use the GitHub API to find the latest version for this project. + # 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 -SsL $latest_url | awk '/\/tag\//' | head -n 1 | cut -d '"' -f 2 | awk '{n=split($NF,a,"/");print a[n]}') From f206f03a1baab9b15927bf773549eb05bec772df Mon Sep 17 00:00:00 2001 From: Trevor Hartman Date: Tue, 25 Apr 2017 10:03:27 -0600 Subject: [PATCH 6/6] Update Slack channels --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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)