Skip to content

Commit de4d8b7

Browse files
committed
remove glob support from kustomization.yaml
1 parent 7f97108 commit de4d8b7

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

examples/multibases/multi-namespace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ resources:
7272
namespace: namespace-b
7373
EOF
7474
75-
cat <<EOF >$NSA/namespace.yaml
75+
cat <<EOF >$NSB/namespace.yaml
7676
apiVersion: v1
7777
kind: Namespace
7878
metadata:

pkg/commands/testdata/testcase-base-only/in/kustomization.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ commonLabels:
66
commonAnnotations:
77
note: This is a test annotation
88
resources:
9-
- resources/*.yaml
9+
- resources/deployment.yaml
10+
- resources/networkpolicy.yaml
11+
- resources/service.yaml

pkg/resmap/resmap.go

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,18 +134,15 @@ func NewResourceSliceFromPatches(
134134
loader loader.Loader, paths []string) ([]*resource.Resource, error) {
135135
var result []*resource.Resource
136136
for _, path := range paths {
137-
contents, err := loader.GlobLoad(path)
137+
content, err := loader.Load(path)
138138
if err != nil {
139139
return nil, err
140140
}
141-
for p, content := range contents {
142-
res, err := newResourceSliceFromBytes(content)
143-
if err != nil {
144-
return nil, internal.Handler(err, p)
145-
}
146-
result = append(result, res...)
147-
141+
res, err := newResourceSliceFromBytes(content)
142+
if err != nil {
143+
return nil, internal.Handler(err, path)
148144
}
145+
result = append(result, res...)
149146
}
150147
return result, nil
151148
}
@@ -154,17 +151,15 @@ func NewResourceSliceFromPatches(
154151
func NewResMapFromFiles(loader loader.Loader, paths []string) (ResMap, error) {
155152
var result []ResMap
156153
for _, path := range paths {
157-
contents, err := loader.GlobLoad(path)
154+
content, err := loader.Load(path)
158155
if err != nil {
159156
return nil, errors.Wrap(err, "Load from path "+path+" failed")
160157
}
161-
for p, content := range contents {
162-
res, err := newResMapFromBytes(content)
163-
if err != nil {
164-
return nil, internal.Handler(err, p)
165-
}
166-
result = append(result, res)
158+
res, err := newResMapFromBytes(content)
159+
if err != nil {
160+
return nil, internal.Handler(err, path)
167161
}
162+
result = append(result, res)
168163
}
169164
return MergeWithoutOverride(result...)
170165
}

0 commit comments

Comments
 (0)