upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-04-15 21:59:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(helm): add tiller-host to plugin environment

Browse source
This commit is contained in:
Adam Reese 2016-12-16 20:43:30 -08:00
parent b3d812b346
commit 8a2516fcc1
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/helm/plugins.go
View file

@ -112,7 +112,7 @@ func loadPlugins(baseCmd *cobra.Command, home helmpath.Home, out io.Writer) {
func manuallyProcessArgs(args []string) ([]string, []string) {
known := []string{}
unknown := []string{}
kvargs := []string{"--host", "--kube-context", "--home"}
kvargs := []string{"--host", "--kube-context", "--home", "--tiller-namespace"}
knownArg := func(a string) bool {
for _, pre := range kvargs {
if strings.HasPrefix(a, pre+"=") {
@ -175,7 +175,8 @@ func setupEnv(shortname, base, plugdirs string, home helmpath.Home) {
"HELM_PATH_LOCAL_REPOSITORY": home.LocalRepository(),
"HELM_PATH_STARTER": home.Starters(),
"TILLER_HOST": tillerHost,
"TILLER_HOST": tillerHost,
tillerNamespaceEnvVar: tillerNamespace,
} {
os.Setenv(key, val)
}

13
cmd/helm/plugins_test.go
View file

@ -31,18 +31,16 @@ import (
func TestManuallyProcessArgs(t *testing.T) {
input := []string{
"--debug",
"--foo",
"bar",
"--host",
"example.com",
"--kube-context",
"test1",
"--foo", "bar",
"--host", "example.com",
"--kube-context", "test1",
"--home=/tmp",
"--tiller-namespace=hello",
"command",
}
expectKnown := []string{
"--debug", "--host", "example.com", "--kube-context", "test1", "--home=/tmp",
"--debug", "--host", "example.com", "--kube-context", "test1", "--home=/tmp", "--tiller-namespace=hello",
}
expectUnknown := []string{
@ -162,6 +160,7 @@ func TestSetupEnv(t *testing.T) {
{"HELM_PATH_LOCAL_REPOSITORY", hh.LocalRepository()},
{"HELM_PATH_STARTER", hh.Starters()},
{"TILLER_HOST", tillerHost},
{"TILLER_NAMESPACE", tillerNamespace},
} {
if got := os.Getenv(tt.name); got != tt.expect {
t.Errorf("Expected $%s=%q, got %q", tt.name, tt.expect, got)