Merge pull request #2700 from fluxcd/fix-bootstrap-fs
MacOS: fix bootstrap manifest generation
This commit is contained in:
@@ -26,7 +26,6 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/fluxcd/pkg/kustomize/filesys"
|
|
||||||
"github.com/fluxcd/pkg/untar"
|
"github.com/fluxcd/pkg/untar"
|
||||||
|
|
||||||
"github.com/fluxcd/flux2/pkg/manifestgen/kustomization"
|
"github.com/fluxcd/flux2/pkg/manifestgen/kustomization"
|
||||||
@@ -126,12 +125,7 @@ func build(base, output string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
outputBase := filepath.Dir(strings.TrimSuffix(output, string(filepath.Separator)))
|
if err = os.WriteFile(output, resources, 0o640); err != nil {
|
||||||
fs, err := filesys.MakeFsOnDiskSecure(outputBase)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err = fs.WriteFile(output, resources); err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user