From fa0ff32b00fa017b9aa95cb744d2a933679789b5 Mon Sep 17 00:00:00 2001 From: hori-ryota Date: Wed, 4 Jul 2018 19:01:46 +0900 Subject: [PATCH 1/2] Bugfix for helm-binary flag. to global --- main.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/main.go b/main.go index 46800c68..cf8ace79 100644 --- a/main.go +++ b/main.go @@ -78,8 +78,8 @@ func main() { if len(args) > 0 { helm.SetExtraArgs(args...) } - if c.String("helm-binary") != "" { - helm.SetHelmBinary(c.String("helm-binary")) + if c.GlobalString("helm-binary") != "" { + helm.SetHelmBinary(c.GlobalString("helm-binary")) } return state.SyncRepos(helm) @@ -111,8 +111,8 @@ func main() { if len(args) > 0 { helm.SetExtraArgs(args...) } - if c.String("helm-binary") != "" { - helm.SetHelmBinary(c.String("helm-binary")) + if c.GlobalString("helm-binary") != "" { + helm.SetHelmBinary(c.GlobalString("helm-binary")) } values := c.StringSlice("values") @@ -151,8 +151,8 @@ func main() { if len(args) > 0 { helm.SetExtraArgs(args...) } - if c.String("helm-binary") != "" { - helm.SetHelmBinary(c.String("helm-binary")) + if c.GlobalString("helm-binary") != "" { + helm.SetHelmBinary(c.GlobalString("helm-binary")) } if c.Bool("sync-repos") { @@ -193,8 +193,8 @@ func main() { if len(args) > 0 { helm.SetExtraArgs(strings.Split(args, " ")...) } - if c.String("helm-binary") != "" { - helm.SetHelmBinary(c.String("helm-binary")) + if c.GlobalString("helm-binary") != "" { + helm.SetHelmBinary(c.GlobalString("helm-binary")) } values := c.StringSlice("values") @@ -237,8 +237,8 @@ func main() { if len(args) > 0 { helm.SetExtraArgs(args...) } - if c.String("helm-binary") != "" { - helm.SetHelmBinary(c.String("helm-binary")) + if c.GlobalString("helm-binary") != "" { + helm.SetHelmBinary(c.GlobalString("helm-binary")) } values := c.StringSlice("values") @@ -271,8 +271,8 @@ func main() { if len(args) > 0 { helm.SetExtraArgs(args...) } - if c.String("helm-binary") != "" { - helm.SetHelmBinary(c.String("helm-binary")) + if c.GlobalString("helm-binary") != "" { + helm.SetHelmBinary(c.GlobalString("helm-binary")) } return state.ReleaseStatuses(helm, workers) @@ -324,8 +324,8 @@ func main() { if len(args) > 0 { helm.SetExtraArgs(args...) } - if c.String("helm-binary") != "" { - helm.SetHelmBinary(c.String("helm-binary")) + if c.GlobalString("helm-binary") != "" { + helm.SetHelmBinary(c.GlobalString("helm-binary")) } return state.TestReleases(helm, cleanup, timeout) From 7f37c6b39f8d47fdbd0f1a67097a4f18fe5643b5 Mon Sep 17 00:00:00 2001 From: hori-ryota Date: Wed, 4 Jul 2018 22:10:17 +0900 Subject: [PATCH 2/2] Add helm-binary opt to delete command --- main.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main.go b/main.go index cf8ace79..0aca86af 100644 --- a/main.go +++ b/main.go @@ -292,6 +292,10 @@ func main() { return eachDesiredStateDo(c, func(state *state.HelmState, helm helmexec.Interface) []error { purge := c.Bool("purge") + if c.GlobalString("helm-binary") != "" { + helm.SetHelmBinary(c.GlobalString("helm-binary")) + } + return state.DeleteReleases(helm, purge) }) },