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

fix: Always getting deprecated warning (#493) 

Fixes #485
This commit is contained in:
KUOKA Yusuke 2019-03-19 19:15:37 +09:00 committed by GitHub
parent 8f7ab740bd
commit 79ae2df71f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.go
View File

@ -153,10 +153,6 @@ func main() {
Name: "values", Name: "values",
Usage: "additional value files to be merged into the command", Usage: "additional value files to be merged into the command",
}, },
cli.BoolFlag{
Name: "sync-repos",
Usage: "DEPRECATED",
},
cli.BoolFlag{ cli.BoolFlag{
Name: "skip-deps", Name: "skip-deps",
Usage: "skip running `helm repo update` and `helm dependency build`", Usage: "skip running `helm repo update` and `helm dependency build`",
@ -178,9 +174,6 @@ func main() {
Action: func(c *cli.Context) error { Action: func(c *cli.Context) error {
return findAndIterateOverDesiredStatesUsingFlags(c, func(state *state.HelmState, helm helmexec.Interface, ctx app.Context) []error { return findAndIterateOverDesiredStatesUsingFlags(c, func(state *state.HelmState, helm helmexec.Interface, ctx app.Context) []error {
if !c.Bool("skip-deps") { if !c.Bool("skip-deps") {
if c.Bool("sync-repos") {
logger.Warnf("--sync-repos has been removed and `helmfile diff` updates repositories by default. Provide `--skip-repo-update` to opt-out.")
}
if errs := ctx.SyncReposOnce(state, helm); errs != nil && len(errs) > 0 { if errs := ctx.SyncReposOnce(state, helm); errs != nil && len(errs) > 0 {
return errs return errs
} }
@ -333,10 +326,6 @@ func main() {
Name: "suppress-secrets", Name: "suppress-secrets",
Usage: "suppress secrets in the diff output. highly recommended to specify on CI/CD use-cases", Usage: "suppress secrets in the diff output. highly recommended to specify on CI/CD use-cases",
}, },
cli.BoolFlag{
Name: "skip-repo-update",
Usage: "skip running `helm repo update` on repositories declared in helmfile",
},
cli.BoolFlag{ cli.BoolFlag{
Name: "skip-deps", Name: "skip-deps",
Usage: "skip running `helm repo update` and `helm dependency build`", Usage: "skip running `helm repo update` and `helm dependency build`",
@ -344,10 +333,7 @@ func main() {
}, },
Action: func(c *cli.Context) error { Action: func(c *cli.Context) error {
return findAndIterateOverDesiredStatesUsingFlags(c, func(st *state.HelmState, helm helmexec.Interface, ctx app.Context) []error { return findAndIterateOverDesiredStatesUsingFlags(c, func(st *state.HelmState, helm helmexec.Interface, ctx app.Context) []error {
if !c.Bool("skip-deps") || !c.Bool("skip-repo-update") { if !c.Bool("skip-deps") {
if !c.Bool("skip-repo-update") {
logger.Warn("--skip-repo-update has been deprecated. Provide --skip-deps instead.")
}
if errs := ctx.SyncReposOnce(st, helm); errs != nil && len(errs) > 0 { if errs := ctx.SyncReposOnce(st, helm); errs != nil && len(errs) > 0 {
return errs return errs
} }