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

More merge tests, clearer method names.

Browse Source
This commit is contained in:
jregan
2020-12-22 17:26:12 -08:00
parent 6b30b72ebc
commit 8b97274af3
7 changed files with 478 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/resmap/merginator.go
View File

@@ -16,7 +16,7 @@ type merginator struct {
result ResMap
}
func (m *merginator) Merge(in []*resource.Resource) (ResMap, error) {
func (m *merginator) ConflatePatches(in []*resource.Resource) (ResMap, error) {
m.result = New()
m.incoming = in
for index := range m.incoming {