kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-07-16 17:33:14 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix a patch files accept multiple patches (#5194)

Browse Source 
* fix a patch files accept multiple patches

* fix comments and variable name

* add error handling when using not allowed multiple strategic-merge patches

* fix error message of Multiple Strategic-Merge Patch file

* refactor transformStrategicMerge()

* add TODO comment and test for Multiple JSON patch Yaml documents are not allowed

* refactoring PatchTransformer

* add multiple patch test for PatchTransformer package

* improve error message to PatchTransformer

* refactor const and error message check

* fix some error messages
This commit is contained in:
yugo kobayashi
2023-09-16 08:20:13 +09:00
committed by GitHub
parent 56d37acc7d
commit 59696d1ace
5 changed files with 386 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/resmap/reswrangler.go
View File

@@ -696,8 +696,7 @@ func (m *resWrangler) DeAnchor() (err error) {
}
// ApplySmPatch applies the patch, and errors on Id collisions.
func (m *resWrangler) ApplySmPatch(
selectedSet *resource.IdSet, patch *resource.Resource) error {
func (m *resWrangler) ApplySmPatch(selectedSet *resource.IdSet, patch *resource.Resource) error {
var list []*resource.Resource
for _, res := range m.rList {
if selectedSet.Contains(res.CurId()) {