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

Addresses slice case with notNamespaceable objects

Browse Source
This commit is contained in:
Jerome Brette
2019-06-26 22:41:19 -05:00
parent 878960d7b1
commit 7998ee7036
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/transformers/namereference.go
View File

@@ -117,7 +117,7 @@ func (o *nameReferenceTransformer) getNewNameFunc(
for _, res := range referralCandidates.Resources() { for _, res := range referralCandidates.Resources() {
id := res.OrgId() id := res.OrgId()
if id.IsSelected(&target) && res.GetOriginalName() == oldName { if id.IsSelected(&target) && res.GetOriginalName() == oldName {
matches := referralCandidates.GetMatchingResourcesByOriginalId(id.GvknEquals) matches := referralCandidates.GetMatchingResourcesByOriginalId(id.Equals)
// If there's more than one match, there's no way // If there's more than one match, there's no way
// to know which one to pick, so emit error. // to know which one to pick, so emit error.
if len(matches) > 1 { if len(matches) > 1 {
@@ -149,7 +149,7 @@ func (o *nameReferenceTransformer) getNewNameFunc(
indexes := indexOf(res.GetOriginalName(), names) indexes := indexOf(res.GetOriginalName(), names)
id := res.OrgId() id := res.OrgId()
if id.IsSelected(&target) && len(indexes) > 0 { if id.IsSelected(&target) && len(indexes) > 0 {
matches := referralCandidates.GetMatchingResourcesByOriginalId(id.GvknEquals) matches := referralCandidates.GetMatchingResourcesByOriginalId(id.Equals)
if len(matches) > 1 { if len(matches) > 1 {
return nil, fmt.Errorf( return nil, fmt.Errorf(
"slice case - multiple matches for %s:\n %v", "slice case - multiple matches for %s:\n %v",