From 7e7a1d17eca6fe195efcace0f5005c68128f1301 Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 17 Sep 2018 10:59:44 +0200 Subject: [PATCH 1/2] fix the certificates variables Signed-off-by: cpanato --- cmd/helm/helm.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go index 75fa2dc38..4d038f3b0 100644 --- a/cmd/helm/helm.go +++ b/cmd/helm/helm.go @@ -87,9 +87,9 @@ func newRootCmd(args []string) *cobra.Command { Long: globalUsage, SilenceUsage: true, PersistentPreRun: func(*cobra.Command, []string) { - tlsCaCertFile = os.ExpandEnv(tlsCaCertFile) - tlsCertFile = os.ExpandEnv(tlsCertFile) - tlsKeyFile = os.ExpandEnv(tlsKeyFile) + tlsCaCertFile = os.ExpandEnv("$HELM_TLS_CA_CERT") + tlsCertFile = os.ExpandEnv("$HELM_TLS_CERT") + tlsKeyFile = os.ExpandEnv("$HELM_TLS_KEY") }, PersistentPostRun: func(*cobra.Command, []string) { teardown() @@ -275,15 +275,22 @@ func newClient() helm.Interface { options := []helm.Option{helm.Host(settings.TillerHost), helm.ConnectTimeout(settings.TillerConnectionTimeout)} if settings.TLSVerify || settings.TLSEnable { + + tlsCaCertFile = settings.TLSCaCertFile if tlsCaCertFile == "" { tlsCaCertFile = settings.Home.TLSCaCert() } + + tlsCertFile = settings.TLSCertFile if tlsCertFile == "" { tlsCertFile = settings.Home.TLSCert() } + + tlsKeyFile = settings.TLSKeyFile if tlsKeyFile == "" { tlsKeyFile = settings.Home.TLSKey() } + debug("Host=%q, Key=%q, Cert=%q, CA=%q\n", tlsServerName, tlsKeyFile, tlsCertFile, tlsCaCertFile) tlsopts := tlsutil.Options{ ServerName: tlsServerName, From 25981b04808624a65556ccf00c2f0935bd42c7d3 Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 17 Sep 2018 11:08:08 +0200 Subject: [PATCH 2/2] update docs Signed-off-by: cpanato --- docs/helm/helm_serve.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/helm/helm_serve.md b/docs/helm/helm_serve.md index 62a68595a..76b714c22 100644 --- a/docs/helm/helm_serve.md +++ b/docs/helm/helm_serve.md @@ -15,7 +15,7 @@ This command is intended to be used for educational and testing purposes only. It is best to rely on a dedicated web server or a cloud-hosted solution like Google Cloud Storage for production use. -See https://github.com/helm/helm/blob/master/docs/chart_repository.md#hosting-chart-repositories +See https://github.com/kubernetes/helm/blob/master/docs/chart_repository.md#hosting-chart-repositories for more information on hosting chart repositories in a production setting. @@ -48,4 +48,4 @@ helm serve [flags] * [helm](helm.md) - The Helm package manager for Kubernetes. -###### Auto generated by spf13/cobra on 1-Aug-2018 +###### Auto generated by spf13/cobra on 17-Sep-2018