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

feat: `helmfile -f <go-getter url>` (#670) 

Extends the remote-helmfile feature to also work when loading the first state file.
This should be useful for people who wants to give helmfile a try without ever opening `$EDITOR`.
This commit is contained in:
KUOKA Yusuke 2019-06-11 14:28:50 +09:00 committed by GitHub
parent 72425aebfc
commit 65d404b276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/app/app.go
View File

@ -306,13 +306,6 @@ func (a *App) visitStates(fileOrDir string, defOpts LoadOpts, converge func(*sta
optsForNestedState.Selectors = m.Selectors optsForNestedState.Selectors = m.Selectors
} }
path, err := a.remote.Locate(m.Path)
if err != nil {
return appError(fmt.Sprintf("in .helmfiles[%d]", i), err)
}
m.Path = path
if err := a.visitStates(m.Path, optsForNestedState, converge); err != nil { if err := a.visitStates(m.Path, optsForNestedState, converge); err != nil {
switch err.(type) { switch err.(type) {
case *NoMatchingHelmfileError: case *NoMatchingHelmfileError:
@ -384,11 +377,9 @@ func (a *App) VisitDesiredStatesWithReleasesFiltered(fileOrDir string, converge
opts.Environment.OverrideValues = envvals opts.Environment.OverrideValues = envvals
} }
var dir string dir, err := a.getwd()
if a.directoryExistsAt(fileOrDir) { if err != nil {
dir = fileOrDir return err
} else {
dir = filepath.Dir(fileOrDir)
} }
getter := &remote.GoGetter{Logger: a.Logger} getter := &remote.GoGetter{Logger: a.Logger}
@ -404,7 +395,7 @@ func (a *App) VisitDesiredStatesWithReleasesFiltered(fileOrDir string, converge
a.remote = remote a.remote = remote
err := a.visitStates(fileOrDir, opts, func(st *state.HelmState, helm helmexec.Interface) (bool, []error) { return a.visitStates(fileOrDir, opts, func(st *state.HelmState, helm helmexec.Interface) (bool, []error) {
if len(st.Selectors) > 0 { if len(st.Selectors) > 0 {
err := st.FilterReleases() err := st.FilterReleases()
if err != nil { if err != nil {
@ -440,10 +431,6 @@ func (a *App) VisitDesiredStatesWithReleasesFiltered(fileOrDir string, converge
return processed, errs return processed, errs
}) })
if err != nil {
return err
}
return nil
} }
func (a *App) findStateFilesInAbsPaths(specifiedPath string) ([]string, error) { func (a *App) findStateFilesInAbsPaths(specifiedPath string) ([]string, error) {
@ -463,6 +450,15 @@ func (a *App) findStateFilesInAbsPaths(specifiedPath string) ([]string, error) {
} }
func (a *App) findDesiredStateFiles(specifiedPath string) ([]string, error) { func (a *App) findDesiredStateFiles(specifiedPath string) ([]string, error) {
path, err := a.remote.Locate(specifiedPath)
if err != nil {
return nil, fmt.Errorf("locate: %v", err)
}
if specifiedPath != path {
a.Logger.Debugf("fetched remote \"%s\" to local cache \"%s\" and loading the latter...", specifiedPath, path)
}
specifiedPath = path
var helmfileDir string var helmfileDir string
if specifiedPath != "" { if specifiedPath != "" {
if a.fileExistsAt(specifiedPath) { if a.fileExistsAt(specifiedPath) {

4
pkg/remote/remote.go
View File

@ -179,6 +179,10 @@ func (r *Remote) Fetch(goGetterSrc string) (string, error) {
cacheDirPath := filepath.Join(r.Home, getterDst) cacheDirPath := filepath.Join(r.Home, getterDst)
r.Logger.Debugf("home: %s", r.Home)
r.Logger.Debugf("getter dest: %s", getterDst)
r.Logger.Debugf("cached dir: %s", cacheDirPath)
{ {
if r.FileExists(cacheDirPath) { if r.FileExists(cacheDirPath) {
return "", fmt.Errorf("%s is not directory. please remove it so that variant could use it for dependency caching", getterDst) return "", fmt.Errorf("%s is not directory. please remove it so that variant could use it for dependency caching", getterDst)