helm
/
helm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2348 from technosophos/fix/environment-style-fixes 

fix(helm): fix style errors in pkg/environment
This commit is contained in:
Matt Butcher 2017-04-28 14:17:28 -06:00 committed by GitHub
parent ba3f6c3f3b 3c55a0ee65
commit 3a943696b7
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/helm/environment/environment.go
View File

@ -30,12 +30,17 @@ import (
)
const (
HomeEnvVar = "HELM_HOME"
PluginEnvVar = "HELM_PLUGIN"
// HomeEnvVar is the HELM_HOME environment variable key.
HomeEnvVar = "HELM_HOME"
// PluginEnvVar is the HELM_PLUGIN environment variable key.
PluginEnvVar = "HELM_PLUGIN"
// PluginDisableEnvVar is the HELM_NO_PLUGINS environment variable key.
PluginDisableEnvVar = "HELM_NO_PLUGINS"
HostEnvVar = "HELM_HOST"
// HostEnvVar is the HELM_HOST environment variable key.
HostEnvVar = "HELM_HOST"
)
// DefaultHelmHome gets the configured HELM_HOME, or returns the default.
func DefaultHelmHome() string {
if home := os.Getenv(HomeEnvVar); home != "" {
return home
@ -43,14 +48,21 @@ func DefaultHelmHome() string {
return filepath.Join(os.Getenv("HOME"), ".helm")
}
// DefaultHelmHost returns the configured HELM_HOST or an empty string.
func DefaultHelmHost() string {
return os.Getenv(HostEnvVar)
}
// EnvSettings describes all of the environment settings.
type EnvSettings struct {
TillerHost string
// TillerHost is the host and port of Tiller.
TillerHost string
// TillerNamespace is the namespace in which Tiller runs.
TillerNamespace string
Home helmpath.Home
PlugDirs string
Debug bool
// Home is the local path to the Helm home directory.
Home helmpath.Home
// PluginDirs is the path to the plugin directories.
PlugDirs string
// Debug indicates whether or not Helm is running in Debug mode.
Debug bool
}