public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bugfix for helm-binary flag. to global (#184) 

Two follow-up commits for #181 

* Make the --helm-binary flag global
* Add helm-binary support to the delete command
This commit is contained in:
KUOKA Yusuke 2018-07-05 11:56:09 +09:00 committed by GitHub
parent 9f57f8be7d 7f37c6b39f
commit 35732f3a93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
main.go
View File

@ -78,8 +78,8 @@ func main() {
if len(args) > 0 { if len(args) > 0 {
helm.SetExtraArgs(args...) helm.SetExtraArgs(args...)
} }
if c.String("helm-binary") != "" { if c.GlobalString("helm-binary") != "" {
helm.SetHelmBinary(c.String("helm-binary")) helm.SetHelmBinary(c.GlobalString("helm-binary"))
} }
return state.SyncRepos(helm) return state.SyncRepos(helm)
@ -111,8 +111,8 @@ func main() {
if len(args) > 0 { if len(args) > 0 {
helm.SetExtraArgs(args...) helm.SetExtraArgs(args...)
} }
if c.String("helm-binary") != "" { if c.GlobalString("helm-binary") != "" {
helm.SetHelmBinary(c.String("helm-binary")) helm.SetHelmBinary(c.GlobalString("helm-binary"))
} }
values := c.StringSlice("values") values := c.StringSlice("values")
@ -151,8 +151,8 @@ func main() {
if len(args) > 0 { if len(args) > 0 {
helm.SetExtraArgs(args...) helm.SetExtraArgs(args...)
} }
if c.String("helm-binary") != "" { if c.GlobalString("helm-binary") != "" {
helm.SetHelmBinary(c.String("helm-binary")) helm.SetHelmBinary(c.GlobalString("helm-binary"))
} }
if c.Bool("sync-repos") { if c.Bool("sync-repos") {
@ -193,8 +193,8 @@ func main() {
if len(args) > 0 { if len(args) > 0 {
helm.SetExtraArgs(strings.Split(args, " ")...) helm.SetExtraArgs(strings.Split(args, " ")...)
} }
if c.String("helm-binary") != "" { if c.GlobalString("helm-binary") != "" {
helm.SetHelmBinary(c.String("helm-binary")) helm.SetHelmBinary(c.GlobalString("helm-binary"))
} }
values := c.StringSlice("values") values := c.StringSlice("values")
@ -237,8 +237,8 @@ func main() {
if len(args) > 0 { if len(args) > 0 {
helm.SetExtraArgs(args...) helm.SetExtraArgs(args...)
} }
if c.String("helm-binary") != "" { if c.GlobalString("helm-binary") != "" {
helm.SetHelmBinary(c.String("helm-binary")) helm.SetHelmBinary(c.GlobalString("helm-binary"))
} }
values := c.StringSlice("values") values := c.StringSlice("values")
@ -271,8 +271,8 @@ func main() {
if len(args) > 0 { if len(args) > 0 {
helm.SetExtraArgs(args...) helm.SetExtraArgs(args...)
} }
if c.String("helm-binary") != "" { if c.GlobalString("helm-binary") != "" {
helm.SetHelmBinary(c.String("helm-binary")) helm.SetHelmBinary(c.GlobalString("helm-binary"))
} }
return state.ReleaseStatuses(helm, workers) return state.ReleaseStatuses(helm, workers)
@ -292,6 +292,10 @@ func main() {
return eachDesiredStateDo(c, func(state *state.HelmState, helm helmexec.Interface) []error { return eachDesiredStateDo(c, func(state *state.HelmState, helm helmexec.Interface) []error {
purge := c.Bool("purge") purge := c.Bool("purge")
if c.GlobalString("helm-binary") != "" {
helm.SetHelmBinary(c.GlobalString("helm-binary"))
}
return state.DeleteReleases(helm, purge) return state.DeleteReleases(helm, purge)
}) })
}, },
@ -324,8 +328,8 @@ func main() {
if len(args) > 0 { if len(args) > 0 {
helm.SetExtraArgs(args...) helm.SetExtraArgs(args...)
} }
if c.String("helm-binary") != "" { if c.GlobalString("helm-binary") != "" {
helm.SetHelmBinary(c.String("helm-binary")) helm.SetHelmBinary(c.GlobalString("helm-binary"))
} }
return state.TestReleases(helm, cleanup, timeout) return state.TestReleases(helm, cleanup, timeout)