mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-06 09:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Final fix for error on delete

Browse Source
This commit is contained in:
Leonardo Quatrocchi 2024-04-22 20:45:28 -03:00
parent 05ca35e228
commit 64d0833303
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controller/controller.go
View File

@ -210,13 +210,6 @@ func (c *Controller) RunOnce(ctx context.Context) error {
return err return err
} }
records = endpoint.RemoveDuplicates(records)
//This deduplication seems to be the a good fit
//Duplicated endpoints were living on this variable
//In all versions for the overlapping zones
//With this in place the change on plan.go is not needed
//Also it saves some rounds of cpu
//Keeping this here until we decide what's best
registryEndpointsTotal.Set(float64(len(records))) registryEndpointsTotal.Set(float64(len(records)))
regARecords, regAAAARecords := countAddressRecords(records) regARecords, regAAAARecords := countAddressRecords(records)
registryARecords.Set(float64(regARecords)) registryARecords.Set(float64(regARecords))

20
plan/plan.go
View File

@ -170,20 +170,6 @@ func (p *Plan) Calculate() *Plan {
if p.DomainFilter == nil { if p.DomainFilter == nil {
p.DomainFilter = endpoint.MatchAllDomainFilters(nil) p.DomainFilter = endpoint.MatchAllDomainFilters(nil)
} }
// Root cause of the issue:
// Behavior on 0.14.0 on Deletes
// ------------------------------------------------------------------------------------------------------
// DNSName | Current record | Desired Records (Candidate) |
// ------------------------------------------------------------------------------------------------------
// dnsname.zone.com |[dnsname.zone.com IN A]dnsname.zone.com IN A (dup ep)| [] |
// ------------------------------------------------------------------------------------------------------
//
// Behavior on 0.13.6 on Deletes
// ------------------------------------------------------------------------------------------------------
// DNSName | Current record | Desired Records (Candidate) |
// ------------------------------------------------------------------------------------------------------
// dnsname.zone.com | [dnsname.zone.com IN CNAME ] | [] |
// ------------------------------------------------------------------------------------------------------
for _, current := range filterRecordsForPlan(p.Current, p.DomainFilter, p.ManagedRecords, p.ExcludeRecords) { for _, current := range filterRecordsForPlan(p.Current, p.DomainFilter, p.ManagedRecords, p.ExcludeRecords) {
t.addCurrent(current) t.addCurrent(current)
@ -266,11 +252,7 @@ func (p *Plan) Calculate() *Plan {
// filter out updates this external dns does not have ownership claim over // filter out updates this external dns does not have ownership claim over
if p.OwnerID != "" { if p.OwnerID != "" {
changes.Delete = endpoint.FilterEndpointsByOwnerID(p.OwnerID, changes.Delete) changes.Delete = endpoint.FilterEndpointsByOwnerID(p.OwnerID, changes.Delete)
// Remove duplicated endpoints generated by plan.go on Line 210 changes.Delete = endpoint.RemoveDuplicates(changes.Delete)
// changes.Delete = endpoint.RemoveDuplicates(changes.Delete)
// This was not needed on version 0.13.6, but it seems like
// the old function/code had the ability of removing duplicated endpoints
// While the filterRecordsForPlan and addCurrent functions were running
changes.UpdateOld = endpoint.FilterEndpointsByOwnerID(p.OwnerID, changes.UpdateOld) changes.UpdateOld = endpoint.FilterEndpointsByOwnerID(p.OwnerID, changes.UpdateOld)
changes.UpdateNew = endpoint.FilterEndpointsByOwnerID(p.OwnerID, changes.UpdateNew) changes.UpdateNew = endpoint.FilterEndpointsByOwnerID(p.OwnerID, changes.UpdateNew)
} }