luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

dns: keep NS names in consul domain

This commit is contained in:
Frank Schroeder 2017-08-07 11:10:22 +02:00
parent 7b39af2b2d
commit b571cb8097
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
agent/dns.go
View File

@ -272,7 +272,7 @@ func (d *DNSServer) addSOA(msg *dns.Msg) {
func (d *DNSServer) nameservers(edns bool) (ns []dns.RR, extra []dns.RR) { func (d *DNSServer) nameservers(edns bool) (ns []dns.RR, extra []dns.RR) {
// get server names and store them in a map to randomize the output // get server names and store them in a map to randomize the output
servers := map[string]net.IP{} servers := map[string]net.IP{}
for name, addr := range d.agent.delegate.ServerAddrs() { for _, addr := range d.agent.delegate.ServerAddrs() {
host, _, err := net.SplitHostPort(addr) host, _, err := net.SplitHostPort(addr)
if err != nil { if err != nil {
d.logger.Println("[WARN] Unable to parse address %v, got error: %v", addr, err) d.logger.Println("[WARN] Unable to parse address %v, got error: %v", addr, err)
@ -283,17 +283,9 @@ func (d *DNSServer) nameservers(edns bool) (ns []dns.RR, extra []dns.RR) {
continue continue
} }
// name is "name.dc" and domain is "consul."
// we want "name.node.dc.consul."
lastdot := strings.LastIndexByte(name, '.')
nodeName := name[:lastdot]
if InvalidDnsRe.MatchString(nodeName) {
d.logger.Printf("[WARN] dns: Node name %q is not a valid dns host name, will not be added to NS record", nodeName)
continue
}
fqdn := nodeName + ".node" + name[lastdot:] + "." + d.domain
// create a consistent, unique and sanitized name for the server // create a consistent, unique and sanitized name for the server
r := strings.NewReplacer(".", "-", ":", "-")
fqdn := "server-" + r.Replace(host) + "." + d.domain
fqdn = dns.Fqdn(strings.ToLower(fqdn)) fqdn = dns.Fqdn(strings.ToLower(fqdn))
servers[fqdn] = ip servers[fqdn] = ip