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

support binaryData merge

Browse Source
This commit is contained in:
Donny Xia
2021-02-11 13:33:28 -08:00
parent dd72ea1e6a
commit 6518393f5d
5 changed files with 77 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/resmap/reswrangler.go
View File

@@ -489,6 +489,7 @@ func (m *resWrangler) appendReplaceOrMerge(res *resource.Resource) error {
case types.BehaviorMerge:
res.CopyMergeMetaDataFieldsFrom(old)
res.MergeDataMapFrom(old)
res.MergeBinaryDataMapFrom(old)
default:
return fmt.Errorf(
"id %#v exists; behavior must be merge or replace", id)