From d1ad119ee7cefb1dbb16a8032652746523031e9c Mon Sep 17 00:00:00 2001 From: supermeng Date: Thu, 14 Sep 2017 18:23:54 +0800 Subject: [PATCH] Disable app.lain dns A record --- dns/creator.go | 17 ----------------- dns/creator_test.go | 10 +--------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/dns/creator.go b/dns/creator.go index ca8bb94..899fc36 100644 --- a/dns/creator.go +++ b/dns/creator.go @@ -140,7 +140,6 @@ func (c *Creator) prepareData() []string { } } - var webrouterIp string for key, val := range c.fqdns { var domains []string if err := json.Unmarshal([]byte(val), &domains); err != nil { @@ -148,26 +147,10 @@ func (c *Creator) prepareData() []string { continue } for _, line := range domains { - if key == "tinydns_fqdns/webrouter.lain" { - if strings.HasPrefix(line, "+webrouter.lain:") { - fields := strings.Split(line, ":") - if len(fields) > 1 { - webrouterIp = fields[1] - } else { - log.Errorf("Cannot get webrouter ip: %s\n", line) - } - } - } lines = append(lines, line) } } - if webrouterIp != "" { - for app := range apps { - lines = append(lines, fmt.Sprintf("+%s.lain:%s:300::", app, webrouterIp)) - } - } - for ip, id := range node.index { if id < 0 { continue diff --git a/dns/creator_test.go b/dns/creator_test.go index 06f4059..3726564 100644 --- a/dns/creator_test.go +++ b/dns/creator_test.go @@ -462,16 +462,8 @@ func TestPrepareData(t *testing.T) { "=vaultProxy-1.vault.lain:172.20.0.7:300", "=web-1.vault.lain:172.20.0.6:300", "=web-1.lvault.lain:172.20.0.8:300", - "+webrouter.lain:192.168.77.201:300::", - "+registry.lain:192.168.77.201:300::", - "+deploy.lain:192.168.77.201:300::", - "+perf.lain:192.168.77.201:300::", - "+console.lain:192.168.77.201:300::", - "+tinydns.lain:192.168.77.201:300::", - "+vault.lain:192.168.77.201:300::", - "+lvault.lain:192.168.77.201:300::", - "+perf.hello-server.resource.lain:192.168.77.201:300::", "=hello.perf.lain:172.20.0.29:300::00", + "+webrouter.lain:192.168.77.201:300::", ".lain:192.168.77.202:a:300", ".20.172.in-addr.arpa:192.168.77.202:a:300", "%00:192.168.77.22",