mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-07 01:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify planner's data structure

Browse Source
This commit is contained in:
John Gardiner Myers 2023-04-13 17:09:56 -07:00
parent e48ec6b241
commit ba26db45ce
1 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
plan/plan.go
View File

@ -64,8 +64,15 @@ type Changes struct {
Delete []*endpoint.Endpoint Delete []*endpoint.Endpoint
} }
// planKey is a key for a row in `planTable`.
type planKey struct {
dnsName string
setIdentifier string
recordType string
}
// planTable is a supplementary struct for Plan // planTable is a supplementary struct for Plan
// each row correspond to a dnsName -> (current record + all desired records) // each row correspond to a planKey -> (current record + all desired records)
/* /*
planTable: (-> = target) planTable: (-> = target)
-------------------------------------------------------- --------------------------------------------------------
@ -78,12 +85,12 @@ bar.com | | [->191.1.1.1, ->190.1.1.1] | = create (bar.com -> 1
"=", i.e. result of calculation relies on supplied ConflictResolver "=", i.e. result of calculation relies on supplied ConflictResolver
*/ */
type planTable struct { type planTable struct {
rows map[string]map[string]map[string]*planTableRow rows map[planKey]*planTableRow
resolver ConflictResolver resolver ConflictResolver
} }
func newPlanTable() planTable { // TODO: make resolver configurable func newPlanTable() planTable { // TODO: make resolver configurable
return planTable{map[string]map[string]map[string]*planTableRow{}, PerResource{}} return planTable{map[planKey]*planTableRow{}, PerResource{}}
} }
// planTableRow // planTableRow
@ -99,31 +106,25 @@ func (t planTableRow) String() string {
} }
func (t planTable) addCurrent(e *endpoint.Endpoint) { func (t planTable) addCurrent(e *endpoint.Endpoint) {
dnsName := normalizeDNSName(e.DNSName) key := t.newPlanKey(e)
if _, ok := t.rows[dnsName]; !ok { t.rows[key].current = e
t.rows[dnsName] = make(map[string]map[string]*planTableRow)
}
if _, ok := t.rows[dnsName][e.SetIdentifier]; !ok {
t.rows[dnsName][e.SetIdentifier] = make(map[string]*planTableRow)
}
if _, ok := t.rows[e.SetIdentifier][e.RecordType]; !ok {
t.rows[dnsName][e.SetIdentifier][e.RecordType] = &planTableRow{}
}
t.rows[dnsName][e.SetIdentifier][e.RecordType].current = e
} }
func (t planTable) addCandidate(e *endpoint.Endpoint) { func (t planTable) addCandidate(e *endpoint.Endpoint) {
dnsName := normalizeDNSName(e.DNSName) key := t.newPlanKey(e)
if _, ok := t.rows[dnsName]; !ok { t.rows[key].candidates = append(t.rows[key].candidates, e)
t.rows[dnsName] = make(map[string]map[string]*planTableRow) }
func (t *planTable) newPlanKey(e *endpoint.Endpoint) planKey {
key := planKey{
dnsName: normalizeDNSName(e.DNSName),
setIdentifier: e.SetIdentifier,
recordType: e.RecordType,
} }
if _, ok := t.rows[dnsName][e.SetIdentifier]; !ok { if _, ok := t.rows[key]; !ok {
t.rows[dnsName][e.SetIdentifier] = make(map[string]*planTableRow) t.rows[key] = &planTableRow{}
} }
if _, ok := t.rows[dnsName][e.SetIdentifier][e.RecordType]; !ok { return key
t.rows[dnsName][e.SetIdentifier][e.RecordType] = &planTableRow{}
}
t.rows[dnsName][e.SetIdentifier][e.RecordType].candidates = append(t.rows[dnsName][e.SetIdentifier][e.RecordType].candidates, e)
} }
func (c *Changes) HasChanges() bool { func (c *Changes) HasChanges() bool {
@ -152,28 +153,24 @@ func (p *Plan) Calculate() *Plan {
changes := &Changes{} changes := &Changes{}
for _, topRow := range t.rows { for _, row := range t.rows {
for _, midRow := range topRow { if row.current == nil { // dns name not taken
for _, row := range midRow { changes.Create = append(changes.Create, t.resolver.ResolveCreate(row.candidates))
if row.current == nil { // dns name not taken }
changes.Create = append(changes.Create, t.resolver.ResolveCreate(row.candidates)) if row.current != nil && len(row.candidates) == 0 {
} changes.Delete = append(changes.Delete, row.current)
if row.current != nil && len(row.candidates) == 0 { }
changes.Delete = append(changes.Delete, row.current)
}
// TODO: allows record type change, which might not be supported by all dns providers // TODO: allows record type change, which might not be supported by all dns providers
if row.current != nil && len(row.candidates) > 0 { // dns name is taken if row.current != nil && len(row.candidates) > 0 { // dns name is taken
update := t.resolver.ResolveUpdate(row.current, row.candidates) update := t.resolver.ResolveUpdate(row.current, row.candidates)
// compare "update" to "current" to figure out if actual update is required // compare "update" to "current" to figure out if actual update is required
if shouldUpdateTTL(update, row.current) || targetChanged(update, row.current) || p.shouldUpdateProviderSpecific(update, row.current) { if shouldUpdateTTL(update, row.current) || targetChanged(update, row.current) || p.shouldUpdateProviderSpecific(update, row.current) {
inheritOwner(row.current, update) inheritOwner(row.current, update)
changes.UpdateNew = append(changes.UpdateNew, update) changes.UpdateNew = append(changes.UpdateNew, update)
changes.UpdateOld = append(changes.UpdateOld, row.current) changes.UpdateOld = append(changes.UpdateOld, row.current)
}
continue
}
} }
continue
} }
} }
for _, pol := range p.Policies { for _, pol := range p.Policies {