msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

fix(cli): use global option string for kubectl

Browse Source
pull/491/head
Adam Reese 9 years ago
parent 84e7abca89
commit c6af169577
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
cmd/helm/server.go
Unescape View File

@ -128,7 +128,7 @@ func installServer(c *cli.Context) error {
manImg := c.String("manager-image") manImg := c.String("manager-image")
dryRun := c.Bool("dry-run") dryRun := c.Bool("dry-run")
kubectlPath := c.String("kubectl") kubectlPath := c.GlobalString("kubectl")
runner := buildKubectlRunner(kubectlPath, dryRun) runner := buildKubectlRunner(kubectlPath, dryRun)
i := client.NewInstaller() i := client.NewInstaller()
@ -146,7 +146,7 @@ func installServer(c *cli.Context) error {
func uninstallServer(c *cli.Context) error { func uninstallServer(c *cli.Context) error {
dryRun := c.Bool("dry-run") dryRun := c.Bool("dry-run")
kubectlPath := c.String("kubectl") kubectlPath := c.GlobalString("kubectl")
runner := buildKubectlRunner(kubectlPath, dryRun) runner := buildKubectlRunner(kubectlPath, dryRun)
out, err := client.Uninstall(runner) out, err := client.Uninstall(runner)
@ -159,7 +159,7 @@ func uninstallServer(c *cli.Context) error {
func statusServer(c *cli.Context) error { func statusServer(c *cli.Context) error {
dryRun := c.Bool("dry-run") dryRun := c.Bool("dry-run")
kubectlPath := c.String("kubectl") kubectlPath := c.GlobalString("kubectl")
runner := buildKubectlRunner(kubectlPath, dryRun) runner := buildKubectlRunner(kubectlPath, dryRun)
out, err := runner.GetByKind("pods", "", "dm") out, err := runner.GetByKind("pods", "", "dm")
@ -172,7 +172,7 @@ func statusServer(c *cli.Context) error {
func targetServer(c *cli.Context) error { func targetServer(c *cli.Context) error {
dryRun := c.Bool("dry-run") dryRun := c.Bool("dry-run")
kubectlPath := c.String("kubectl") kubectlPath := c.GlobalString("kubectl")
runner := buildKubectlRunner(kubectlPath, dryRun) runner := buildKubectlRunner(kubectlPath, dryRun)
out, err := runner.ClusterInfo() out, err := runner.ClusterInfo()

Write Preview
Loading…
Cancel
Save