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

Fix 972

Browse Source
This commit is contained in:
Jeffrey Regan
2019-06-27 17:05:58 -07:00
parent dd0334536b
commit a60d99fdc9
4 changed files with 25 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
k8sdeps/transformer/patch/transformer.go
View File

@@ -13,7 +13,6 @@ import (
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/client-go/kubernetes/scheme"
"sigs.k8s.io/kustomize/v3/pkg/gvk"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/resource"
"sigs.k8s.io/kustomize/v3/pkg/transformers"
@@ -44,7 +43,7 @@ func (tf *transformer) Transform(m resmap.ResMap) error {
return err
}
for _, patch := range patches.Resources() {
target, err := tf.findPatchTarget(m, patch.OrgId())
target, err := m.GetById(patch.OrgId())
if err != nil {
return err
}
@@ -96,21 +95,6 @@ func (tf *transformer) Transform(m resmap.ResMap) error {
return nil
}
func (tf *transformer) findPatchTarget(
m resmap.ResMap, id resid.ResId) (*resource.Resource, error) {
match, err1 := m.GetByOriginalId(id)
if err1 == nil {
return match, nil
}
match, err2 := m.GetByCurrentId(id)
if err2 == nil {
return match, nil
}
return nil, fmt.Errorf(
"%s; %s; failed to find unique target for patch %s",
err1.Error(), err2.Error(), id.GvknString())
}
// mergePatches merge and index patches by OrgId.
// It errors out if there is conflict between patches.
func (tf *transformer) mergePatches() (resmap.ResMap, error) {