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

Add diamond base test.

Browse Source
This commit is contained in:
Jeffrey Regan
2019-06-27 15:22:21 -07:00
parent 0877aa7e0b
commit 3cef37bdb2
3 changed files with 231 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,16 +98,17 @@ func (tf *transformer) Transform(m resmap.ResMap) error {
func (tf *transformer) findPatchTarget(
m resmap.ResMap, id resid.ResId) (*resource.Resource, error) {
match, err := m.GetByOriginalId(id)
if err == nil {
match, err1 := m.GetByOriginalId(id)
if err1 == nil {
return match, nil
}
match, err = m.GetByCurrentId(id)
if err == nil {
match, err2 := m.GetByCurrentId(id)
if err2 == nil {
return match, nil
}
return nil, fmt.Errorf(
"failed to find target for patch %s", id.GvknString())
"%s; %s; failed to find unique target for patch %s",
err1.Error(), err2.Error(), id.GvknString())
}
// mergePatches merge and index patches by OrgId.

2
k8sdeps/transformer/patch/transformer_test.go
View File

@@ -380,7 +380,7 @@ func TestPatchesWithWrongNamespace(t *testing.T) {
if err == nil {
t.Fatalf("did not get expected error")
}
if !strings.Contains(err.Error(), "failed to find target for patch") {
if !strings.Contains(err.Error(), "failed to find unique target for patch") {
t.Fatalf("expected error to contain %q but get %v", "failed to find target for patch", err)
}
}