Merge pull request #1355 from Liujingfang1/patch

enable extended patch transformer and add tests
This commit is contained in:
Kubernetes Prow Robot
2019-07-16 15:58:34 -07:00
committed by GitHub
5 changed files with 1183 additions and 10 deletions

View File

@@ -114,10 +114,11 @@ func (p *PatchTransformerPlugin) Transform(m resmap.ResMap) error {
}
}
if p.loadedPatch != nil {
p.loadedPatch.SetName(resource.GetName())
p.loadedPatch.SetNamespace(resource.GetNamespace())
p.loadedPatch.SetGvk(resource.GetGvk())
err = resource.Patch(p.loadedPatch.Kunstructured)
patchCopy := p.loadedPatch.DeepCopy()
patchCopy.SetName(resource.GetName())
patchCopy.SetNamespace(resource.GetNamespace())
patchCopy.SetGvk(resource.GetGvk())
err = resource.Patch(patchCopy.Kunstructured)
if err != nil {
return err
}

View File

@@ -115,10 +115,11 @@ func (p *plugin) Transform(m resmap.ResMap) error {
}
}
if p.loadedPatch != nil {
p.loadedPatch.SetName(resource.GetName())
p.loadedPatch.SetNamespace(resource.GetNamespace())
p.loadedPatch.SetGvk(resource.GetGvk())
err = resource.Patch(p.loadedPatch.Kunstructured)
patchCopy := p.loadedPatch.DeepCopy()
patchCopy.SetName(resource.GetName())
patchCopy.SetNamespace(resource.GetNamespace())
patchCopy.SetGvk(resource.GetGvk())
err = resource.Patch(patchCopy.Kunstructured)
if err != nil {
return err
}