Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix AutoCertManager delete duplicate records #1198

Merged
merged 2 commits into from
Jan 22, 2024
Merged

fix AutoCertManager delete duplicate records #1198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d59d08e
delete dns records with same name before append
suchen-sci Jan 22, 2024
94a290a
refactor code
suchen-sci Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 46 additions & 2 deletions pkg/object/autocertmanager/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,51 @@ func (d *Domain) waitDNSRecord(value string) error {
}
}

func (d *Domain) deleteDuplicateRecord(dp dnsProvider, record libdns.Record) {
if record.ID != "" {
_, err := dp.DeleteRecords(d.ctx, d.Zone(), []libdns.Record{record})
if err != nil {
logger.Warnf("delete record id %s name %s failed, %v", record.ID, record.Name, err)
}
return
}

allRecords, err := dp.GetRecords(d.ctx, d.Zone())
if err != nil {
logger.Errorf("get records from zone %s failed, %v", d.Zone(), err)
_, err := dp.DeleteRecords(d.ctx, d.Zone(), []libdns.Record{record})
if err != nil {
logger.Warnf("delete records %s from zone %s failed, %v", record.Name, d.Zone(), err)
}
return
}

diffNames := []string{}
delRecords := []libdns.Record{}
for _, r := range allRecords {
if r.Type == record.Type && r.Name == record.Name {
delRecords = append(delRecords, r)
} else if r.Type == record.Type {
diffNames = append(diffNames, r.Name)
}
}
// for debug
logger.Infof("dns records with same type %s but different names %v, append record %s", record.Type, diffNames, record.Name)
if len(delRecords) > 0 {
_, err := dp.DeleteRecords(d.ctx, d.Zone(), delRecords)
if err != nil {
logger.Warnf("delete records %v from zone %s failed, %v", delRecords, d.Zone(), err)
}
return
}

// del records is empty, try to delete record directly.
_, err = dp.DeleteRecords(d.ctx, d.Zone(), []libdns.Record{record})
if err != nil {
logger.Warnf("delete records with name %s from zone %s failed, %v", record.Name, d.Zone(), err)
}
}

func (d *Domain) runDNS01(acm *AutoCertManager, chal *acme.Challenge) error {
client := acm.client

Expand All @@ -200,8 +245,7 @@ func (d *Domain) runDNS01(acm *AutoCertManager, chal *acme.Challenge) error {
name = name[0 : len(name)-len(d.Zone())-1]
record := libdns.Record{Type: "TXT", Name: name}

// ignore the error of DeleteRecords because the record may not exist
dp.DeleteRecords(d.ctx, d.Zone(), []libdns.Record{record})
d.deleteDuplicateRecord(dp, record)

record.Value = value
_, err = dp.AppendRecords(d.ctx, d.Zone(), []libdns.Record{record})
Expand Down
Loading