kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 18:25:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Pin to kyaml/v0.10.18

Browse Source
This commit is contained in:
monopole
2021-04-30 17:39:24 -07:00
parent a64a1022e6
commit 3a508da641
10 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/builtins/PatchTransformer.go
View File

@@ -76,10 +76,9 @@ func (p *PatchTransformerPlugin) Config(
func (p *PatchTransformerPlugin) Transform(m resmap.ResMap) error {
if p.loadedPatch == nil {
return p.transformJson6902(m, p.decodedPatch)
} else {
// The patch was a strategic merge patch
return p.transformStrategicMerge(m, p.loadedPatch)
}
// The patch was a strategic merge patch
return p.transformStrategicMerge(m, p.loadedPatch)
}
// transformStrategicMerge applies the provided strategic merge patch