Commit 194d43c8 authored by Matt Butcher's avatar Matt Butcher

Merge pull request #737 from technosophos/fix/tiller-home

fix(helm): change TILLER_HOST to HELM_HOST
parents 206e7266 93b01edd
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
const ( const (
homeEnvVar = "HELM_HOME" homeEnvVar = "HELM_HOME"
defaultHome = "$HOME/.helm" // FIXME: is $HOME windows compatible? defaultHome = "$HOME/.helm" // FIXME: is $HOME windows compatible?
hostEnvVar = "TILLER_HOST" hostEnvVar = "HELM_HOST"
defaultHost = ":44134" defaultHost = ":44134"
) )
...@@ -42,7 +42,7 @@ Common actions from this point include: ...@@ -42,7 +42,7 @@ Common actions from this point include:
Environment: Environment:
$HELM_HOME Set an alternative location for Helm files. By default, these are stored in ~/.helm $HELM_HOME Set an alternative location for Helm files. By default, these are stored in ~/.helm
$TILLER_HOST Set an alternative Tiller host. The format is host:port (default ":44134"). $HELM_HOST Set an alternative Tiller host. The format is host:port (default ":44134").
` `
// RootCommand is the top-level command for Helm. // RootCommand is the top-level command for Helm.
...@@ -64,7 +64,7 @@ func init() { ...@@ -64,7 +64,7 @@ func init() {
} }
p := RootCommand.PersistentFlags() p := RootCommand.PersistentFlags()
p.StringVar(&helmHome, "home", home, "location of your Helm config. Overrides $HELM_HOME.") p.StringVar(&helmHome, "home", home, "location of your Helm config. Overrides $HELM_HOME.")
p.StringVar(&tillerHost, "host", thost, "address of tiller. Overrides $TILLER_HOST.") p.StringVar(&tillerHost, "host", thost, "address of tiller. Overrides $HELM_HOST.")
p.BoolVarP(&flagVerbose, "verbose", "v", false, "enable verbose output") p.BoolVarP(&flagVerbose, "verbose", "v", false, "enable verbose output")
} }
......
Markdown is supported
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