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

Merge pull request #3040 from natasha41575/fixIssue2896

Browse Source 
fixed issue 2896
This commit is contained in:
Jeff Regan
2020-09-29 17:55:08 -07:00
committed by GitHub
parent bb42d8aa1b c93274c224
commit dd8edb1b01
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/builtins/PatchTransformer.go
View File

@@ -139,9 +139,15 @@ func (p *PatchTransformerPlugin) applySMPatch(resource, patch *resource.Resource
if err != nil { if err != nil {
return err return err
} }
return filtersutil.ApplyToJSON(patchstrategicmerge.Filter{ n, ns := resource.GetName(), resource.GetNamespace()
err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
Patch: node, Patch: node,
}, resource) }, resource)
if len(resource.Map()) != 0 {
resource.SetName(n)
resource.SetNamespace(ns)
}
return err
} }
// transformJson6902 applies the provided json6902 patch // transformJson6902 applies the provided json6902 patch

2
api/krusty/issue2896_test.go
View File

@@ -88,7 +88,7 @@ patches:
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: example name: example-test-api
spec: spec:
template: template:
spec: spec:

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

@@ -143,9 +143,15 @@ func (p *plugin) applySMPatch(resource, patch *resource.Resource) error {
if err != nil { if err != nil {
return err return err
} }
return filtersutil.ApplyToJSON(patchstrategicmerge.Filter{ n, ns := resource.GetName(), resource.GetNamespace()
err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
Patch: node, Patch: node,
}, resource) }, resource)
if len(resource.Map()) != 0 {
resource.SetName(n)
resource.SetNamespace(ns)
}
return err
} }
// transformJson6902 applies the provided json6902 patch // transformJson6902 applies the provided json6902 patch