upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-03-27 12:53:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #2850 from rocky-nupt/fix-update-delete-subcharts

Browse source 
Fix(helm): Fix the bug of dependency update deleting subcharts
This commit is contained in:
Justin Scott 2017-08-29 22:22:58 -07:00 committed by GitHub
commit 8befd50c12
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkg/downloader/manager.go
View file

@ -264,6 +264,9 @@ func (m *Manager) downloadAll(deps []*chartutil.Dependency) error {
return err
}
}
if err := move(tmpPath, destPath); err != nil {
return err
}
if err := os.RemoveAll(tmpPath); err != nil {
return fmt.Errorf("Failed to remove %v: %v", tmpPath, err)
}
@ -610,3 +613,17 @@ func tarFromLocalDir(chartpath string, name string, repo string, version string)
return "", fmt.Errorf("can't get a valid version for dependency %s", name)
}
// move files from tmppath to destpath
func move(tmpPath, destPath string) error {
files, _ := ioutil.ReadDir(tmpPath)
for _, file := range files {
filename := file.Name()
tmpfile := filepath.Join(tmpPath, filename)
destfile := filepath.Join(destPath, filename)
if err := os.Rename(tmpfile, destfile); err != nil {
return fmt.Errorf("Unable to move local charts to charts dir: %v", err)
}
}
return nil
}