kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 01:50:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add glob support

Browse Source
This commit is contained in:
Jingfang Liu
2018-06-21 15:58:37 -07:00
parent c25ed7f7bc
commit 6392e6629f
8 changed files with 147 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/resmap/resmap.go
View File

@@ -113,16 +113,18 @@ func NewResourceSliceFromPatches(
loader loader.Loader, paths []string) ([]*resource.Resource, error) {
result := []*resource.Resource{}
for _, path := range paths {
content, err := loader.Load(path)
contents, err := loader.GlobLoad(path)
if err != nil {
return nil, err
}
for p, content := range contents {
res, err := newResourceSliceFromBytes(content)
if err != nil {
return nil, internal.ErrorHandler(err, p)
}
result = append(result, res...)
res, err := newResourceSliceFromBytes(content)
if err != nil {
return nil, internal.ErrorHandler(err, path)
}
result = append(result, res...)
}
return result, nil
}
@@ -131,15 +133,17 @@ func NewResourceSliceFromPatches(
func NewResMapFromFiles(loader loader.Loader, paths []string) (ResMap, error) {
result := []ResMap{}
for _, path := range paths {
content, err := loader.Load(path)
contents, err := loader.GlobLoad(path)
if err != nil {
return nil, errors.Wrap(err, "Load from path "+path+" failed")
}
res, err := newResMapFromBytes(content)
if err != nil {
return nil, internal.ErrorHandler(err, path)
for p, content := range contents {
res, err := newResMapFromBytes(content)
if err != nil {
return nil, internal.ErrorHandler(err, p)
}
result = append(result, res)
}
result = append(result, res)
}
return MergeWithoutOverride(result...)
}