github/hauler
1
0
Fork 0
mirror of https://github.com/hauler-dev/hauler.git synced 2026-08-19 04:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31 from rancherfederal/issue-30

Browse Source 
bug: fix error when running a package with 0 bundles
This commit is contained in:
Josh Wolf
2021-06-24 08:31:51 -06:00
committed by GitHub
parent 1ea08063ac 39e37cc04a
commit cea46d28fa
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/bootstrap/booter.go
+23 -29
View File
@@ -55,22 +55,28 @@ func (b booter) PreBoot(ctx context.Context, d driver.Driver) error {
return err
}
if err := b.moveBin(); err != nil {
//TODO: Don't hardcode this
binPath := filepath.Join("/opt/hauler/bin")
if err := b.move(b.fs.Bin(), binPath, os.ModePerm); err != nil {
return err
}
bundlesPath := d.DataPath("server/manifests/hauler")
if err := b.move(b.fs.Bundle(), bundlesPath, 0700); err != nil {
return err
}
chartsPath := d.DataPath("server/static/charts/hauler")
if err := b.move(b.fs.Chart(), chartsPath, 0700); err != nil {
return err
}
//Images are slightly different b/c we convert before move as well
//TODO: refactor this better
if err := b.moveImages(d); err != nil {
return err
}
if err := b.moveBundles(d); err != nil {
return err
}
if err := b.moveCharts(d); err != nil {
return err
}
b.logger.Debugf("Writing %s config", d.Name())
if err := d.WriteConfig(); err != nil {
return err
@@ -139,13 +145,17 @@ func (b booter) PostBoot(ctx context.Context, d driver.Driver) error {
}
//TODO: Move* will actually just copy. This is more expensive, but is much safer/easier at handling deep merges, should this change?
func (b booter) moveBin() error {
path := filepath.Join("/opt/hauler/bin")
if err := os.MkdirAll(path, os.ModePerm); err != nil {
func (b booter) move(fsys fs.PkgFs, path string, mode os.FileMode) error {
if err := os.MkdirAll(path, mode); err != nil {
return err
}
return copy.Copy(b.fs.Bin().Path(), path)
err := copy.Copy(fsys.Path(), path)
if !os.IsNotExist(err) && err != nil {
return err
}
return nil
}
func (b booter) moveImages(d driver.Driver) error {
@@ -162,19 +172,3 @@ func (b booter) moveImages(d driver.Driver) error {
return tarball.MultiRefWriteToFile(filepath.Join(path, "hauler.tar"), refs)
}
func (b booter) moveBundles(d driver.Driver) error {
path := d.DataPath("server/manifests/hauler")
if err := os.MkdirAll(path, 0700); err != nil {
return err
}
return copy.Copy(b.fs.Bundle().Path(), path)
}
func (b booter) moveCharts(d driver.Driver) error {
path := d.DataPath("server/static/charts/hauler")
if err := os.MkdirAll(path, 0700); err != nil {
return err
}
return copy.Copy(b.fs.Chart().Path(), path)
}