vxcontrol/external-dns
1
0
Fork 0
mirror of https://github.com/vxcontrol/external-dns.git synced 2026-07-19 18:23:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes duplicate IP records issue for services without exposed ports

Browse Source
This commit is contained in:
janeczku
2017-02-28 13:15:49 +01:00
parent b1ea6eee6a
commit 211b5ca7d4
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
metadata/metadata.go
+17 -13
View File
@@ -130,33 +130,37 @@ func (m *MetadataClient) getContainersDnsRecords(dnsEntries map[string]utils.Dns
fqdn := utils.FqdnFromTemplate(config.NameTemplate, container.ServiceName, container.StackName,
m.EnvironmentName, config.RootDomainName)
records := []string{ip}
dnsEntry := utils.DnsRecord{fqdn, records, "A", config.TTL}
addToDnsEntries(dnsEntry, dnsEntries)
addToDnsEntries(fqdn, ip, dnsEntries)
ourFqdns[fqdn] = struct{}{}
}
}
if len(ourFqdns) > 0 {
fqdn := utils.StateFqdn(m.EnvironmentUUID, config.RootDomainName)
stateRec := utils.StateRecord(fqdn, config.TTL, ourFqdns)
addToDnsEntries(stateRec, dnsEntries)
stateFqdn := utils.StateFqdn(m.EnvironmentUUID, config.RootDomainName)
stateRec := utils.StateRecord(stateFqdn, config.TTL, ourFqdns)
dnsEntries[stateFqdn] = stateRec
}
return nil
}
func addToDnsEntries(dnsEntry utils.DnsRecord, dnsEntries map[string]utils.DnsRecord) {
func addToDnsEntries(fqdn, ip string, dnsEntries map[string]utils.DnsRecord) {
var records []string
if _, ok := dnsEntries[dnsEntry.Fqdn]; !ok {
records = dnsEntry.Records
if _, ok := dnsEntries[fqdn]; !ok {
records = []string{ip}
} else {
records = dnsEntries[dnsEntry.Fqdn].Records
records = append(records, dnsEntry.Records...)
records = dnsEntries[fqdn].Records
// skip if the records already have that IP
for _, val := range records {
if val == ip {
return
}
}
records = append(records, ip)
}
dnsEntry = utils.DnsRecord{dnsEntry.Fqdn, records, dnsEntry.Type, dnsEntry.TTL}
dnsEntries[dnsEntry.Fqdn] = dnsEntry
dnsEntries[fqdn] = utils.DnsRecord{fqdn, records, "A", config.TTL}
}
func containerStateOK(container metadata.Container) bool {