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

Delegate to Kunstructured.

Browse Source
This commit is contained in:
jregan
2020-06-19 14:30:02 -07:00
parent f2da1f621f
commit e783af2881
44 changed files with 204 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/builtin/patchtransformer/PatchTransformer.go
View File

@@ -119,7 +119,7 @@ func (p *plugin) transformStrategicMerge(m resmap.ResMap, patch *resource.Resour
// use the legacy implementation or the kyaml-based solution.
func (p *plugin) applySMPatch(resource, patch *resource.Resource) error {
if !p.YAMLSupport {
return resource.Patch(patch.Kunstructured)
return resource.Patch(patch.Copy())
} else {
node, err := filtersutil.GetRNode(patch)
if err != nil {
@@ -127,7 +127,7 @@ func (p *plugin) applySMPatch(resource, patch *resource.Resource) error {
}
return filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
Patch: node,
}, resource.Kunstructured)
}, resource)
}
}
@@ -169,7 +169,7 @@ func (p *plugin) applyJson6902Patch(resource *resource.Resource, patch jsonpatch
} else {
return filtersutil.ApplyToJSON(patchjson6902.Filter{
Patch: p.Patch,
}, resource.Kunstructured)
}, resource)
}
}