From c6af169577e5cb88cb5e0f9ce6a21f88d80baedf Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Tue, 29 Mar 2016 16:33:08 -0700 Subject: [PATCH] fix(cli): use global option string for kubectl --- cmd/helm/server.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/helm/server.go b/cmd/helm/server.go index 0409bc9f1..ffd0f876e 100644 --- a/cmd/helm/server.go +++ b/cmd/helm/server.go @@ -128,7 +128,7 @@ func installServer(c *cli.Context) error { manImg := c.String("manager-image") dryRun := c.Bool("dry-run") - kubectlPath := c.String("kubectl") + kubectlPath := c.GlobalString("kubectl") runner := buildKubectlRunner(kubectlPath, dryRun) i := client.NewInstaller() @@ -146,7 +146,7 @@ func installServer(c *cli.Context) error { func uninstallServer(c *cli.Context) error { dryRun := c.Bool("dry-run") - kubectlPath := c.String("kubectl") + kubectlPath := c.GlobalString("kubectl") runner := buildKubectlRunner(kubectlPath, dryRun) out, err := client.Uninstall(runner) @@ -159,7 +159,7 @@ func uninstallServer(c *cli.Context) error { func statusServer(c *cli.Context) error { dryRun := c.Bool("dry-run") - kubectlPath := c.String("kubectl") + kubectlPath := c.GlobalString("kubectl") runner := buildKubectlRunner(kubectlPath, dryRun) out, err := runner.GetByKind("pods", "", "dm") @@ -172,7 +172,7 @@ func statusServer(c *cli.Context) error { func targetServer(c *cli.Context) error { dryRun := c.Bool("dry-run") - kubectlPath := c.String("kubectl") + kubectlPath := c.GlobalString("kubectl") runner := buildKubectlRunner(kubectlPath, dryRun) out, err := runner.ClusterInfo()