diff --git a/examples/multibases/multi-namespace.md b/examples/multibases/multi-namespace.md index a7435a797..cb60dbfd3 100644 --- a/examples/multibases/multi-namespace.md +++ b/examples/multibases/multi-namespace.md @@ -72,7 +72,7 @@ resources: namespace: namespace-b EOF -cat <$NSA/namespace.yaml +cat <$NSB/namespace.yaml apiVersion: v1 kind: Namespace metadata: diff --git a/pkg/commands/testdata/testcase-base-only/in/kustomization.yaml b/pkg/commands/testdata/testcase-base-only/in/kustomization.yaml index c611072e2..a968cabb5 100644 --- a/pkg/commands/testdata/testcase-base-only/in/kustomization.yaml +++ b/pkg/commands/testdata/testcase-base-only/in/kustomization.yaml @@ -6,4 +6,6 @@ commonLabels: commonAnnotations: note: This is a test annotation resources: - - resources/*.yaml + - resources/deployment.yaml + - resources/networkpolicy.yaml + - resources/service.yaml diff --git a/pkg/resmap/resmap.go b/pkg/resmap/resmap.go index 59a1cb3c7..cb09a6d37 100644 --- a/pkg/resmap/resmap.go +++ b/pkg/resmap/resmap.go @@ -134,18 +134,15 @@ func NewResourceSliceFromPatches( loader loader.Loader, paths []string) ([]*resource.Resource, error) { var result []*resource.Resource for _, path := range paths { - contents, err := loader.GlobLoad(path) + content, err := loader.Load(path) if err != nil { return nil, err } - for p, content := range contents { - res, err := newResourceSliceFromBytes(content) - if err != nil { - return nil, internal.Handler(err, p) - } - result = append(result, res...) - + res, err := newResourceSliceFromBytes(content) + if err != nil { + return nil, internal.Handler(err, path) } + result = append(result, res...) } return result, nil } @@ -154,17 +151,15 @@ func NewResourceSliceFromPatches( func NewResMapFromFiles(loader loader.Loader, paths []string) (ResMap, error) { var result []ResMap for _, path := range paths { - contents, err := loader.GlobLoad(path) + content, err := loader.Load(path) if err != nil { return nil, errors.Wrap(err, "Load from path "+path+" failed") } - for p, content := range contents { - res, err := newResMapFromBytes(content) - if err != nil { - return nil, internal.Handler(err, p) - } - result = append(result, res) + res, err := newResMapFromBytes(content) + if err != nil { + return nil, internal.Handler(err, path) } + result = append(result, res) } return MergeWithoutOverride(result...) }