Simplify name reference candidate resmap building

This patch removes a layer of looping in the name reference candiate
resmap building process by not checking if the resources already exist
in the new resmap.
This commit is contained in:
Richard Marshall
2019-07-23 23:48:26 -07:00
parent 3d2e956b19
commit ed3c29be12

View File

@@ -552,7 +552,7 @@ func (m *resWrangler) makeCopy(copier resCopier) ResMap {
// SubsetThatCouldBeReferencedByResource implements ResMap. // SubsetThatCouldBeReferencedByResource implements ResMap.
func (m *resWrangler) SubsetThatCouldBeReferencedByResource( func (m *resWrangler) SubsetThatCouldBeReferencedByResource(
inputRes *resource.Resource) ResMap { inputRes *resource.Resource) ResMap {
result := New() result := newOne()
inputId := inputRes.CurId() inputId := inputRes.CurId()
isInputIdNamespaceable := inputId.IsNamespaceableKind() isInputIdNamespaceable := inputId.IsNamespaceableKind()
rctxm := inputRes.PrefixesSuffixesEquals rctxm := inputRes.PrefixesSuffixesEquals
@@ -563,15 +563,16 @@ func (m *resWrangler) SubsetThatCouldBeReferencedByResource(
resId := r.CurId() resId := r.CurId()
if (!isInputIdNamespaceable || !resId.IsNamespaceableKind() || resId.IsNsEquals(inputId)) && if (!isInputIdNamespaceable || !resId.IsNamespaceableKind() || resId.IsNsEquals(inputId)) &&
r.InSameKustomizeCtx(rctxm) { r.InSameKustomizeCtx(rctxm) {
err := result.Append(r) result.append(r)
if err != nil {
panic(err)
}
} }
} }
return result return result
} }
func (m *resWrangler) append(res *resource.Resource) {
m.rList = append(m.rList, res)
}
// AppendAll implements ResMap. // AppendAll implements ResMap.
func (m *resWrangler) AppendAll(other ResMap) error { func (m *resWrangler) AppendAll(other ResMap) error {
if other == nil { if other == nil {