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

Allow references to intermediate names

Browse Source
This commit is contained in:
Natasha Sarkar
2021-02-04 20:38:08 -08:00
parent cbb121e651
commit 384b71b5f5
3 changed files with 264 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
api/filters/nameref/nameref.go
View File

@@ -239,15 +239,25 @@ func acceptAll(r *resource.Resource) bool {
return true
}
func originalNameMatches(name string) sieveFunc {
func previousNameMatches(name string) sieveFunc {
return func(r *resource.Resource) bool {
return r.OrgId().Name == name
for _, id := range r.PrevIds() {
if id.Name == name {
return true
}
}
return false
}
}
func originalIdSelectedByGvk(gvk *resid.Gvk) sieveFunc {
func previousIdSelectedByGvk(gvk *resid.Gvk) sieveFunc {
return func(r *resource.Resource) bool {
return r.OrgId().IsSelected(gvk)
for _, id := range r.PrevIds() {
if id.IsSelected(gvk) {
return true
}
}
return false
}
}
@@ -270,9 +280,7 @@ func (f Filter) roleRefFilter() sieveFunc {
if err != nil {
return acceptAll
}
return func(r *resource.Resource) bool {
return r.OrgId().IsSelected(roleRefGvk)
}
return previousIdSelectedByGvk(roleRefGvk)
}
func prefixSuffixEquals(other resource.ResCtx) sieveFunc {
@@ -307,8 +315,8 @@ func (f Filter) selectReferral(
// The name referral that may need to be updated.
oldName string,
candidates []*resource.Resource) (*resource.Resource, error) {
candidates = doSieve(candidates, originalNameMatches(oldName))
candidates = doSieve(candidates, originalIdSelectedByGvk(&f.ReferralTarget))
candidates = doSieve(candidates, previousNameMatches(oldName))
candidates = doSieve(candidates, previousIdSelectedByGvk(&f.ReferralTarget))
candidates = doSieve(candidates, f.roleRefFilter())
candidates = doSieve(candidates, f.sameCurrentNamespaceAsReferrer())
if len(candidates) == 1 {