diff --git a/plugin/kubernetes/handler.go b/plugin/kubernetes/handler.go index b232417a3..336fd08db 100644 --- a/plugin/kubernetes/handler.go +++ b/plugin/kubernetes/handler.go @@ -2,8 +2,6 @@ package kubernetes import ( "context" - "strings" - "sync/atomic" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/request" @@ -29,10 +27,6 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M err error ) - if wildQuestion(state.Name()) { - atomic.AddUint64(&wildCount, 1) - } - switch state.QType() { case dns.TypeA: records, err = plugin.A(ctx, &k, zone, state, nil, plugin.Options{}) @@ -91,13 +85,8 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M m.Answer = append(m.Answer, records...) m.Extra = append(m.Extra, extra...) w.WriteMsg(m) - return dns.RcodeSuccess, nil } -func wildQuestion(name string) bool { - return strings.HasPrefix(name, "*.") || strings.HasPrefix(name, "any.") || strings.Contains(name, ".*.") || strings.Contains(name, ".any.") -} - // Name implements the Handler interface. func (k Kubernetes) Name() string { return "kubernetes" } diff --git a/plugin/kubernetes/kubernetes.go b/plugin/kubernetes/kubernetes.go index 67d549329..985f857aa 100644 --- a/plugin/kubernetes/kubernetes.go +++ b/plugin/kubernetes/kubernetes.go @@ -86,7 +86,6 @@ var ( errNoItems = errors.New("no items found") errNsNotExposed = errors.New("namespace is not exposed") errInvalidRequest = errors.New("invalid query name") - wildCount uint64 ) // Services implements the ServiceBackend interface. diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go index 06ba2a944..5f5ab0582 100644 --- a/plugin/kubernetes/setup.go +++ b/plugin/kubernetes/setup.go @@ -7,8 +7,6 @@ import ( "os" "strconv" "strings" - "sync/atomic" - "time" "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" @@ -63,25 +61,6 @@ func setup(c *caddy.Controller) error { return nil }) - wildWarner := time.NewTicker(10 * time.Second) - c.OnStartup(func() error { - go func() { - for { - select { - case <-wildWarner.C: - if wc := atomic.SwapUint64(&wildCount, 0); wc > 0 { - log.Warningf("%d deprecated wildcard queries received. Wildcard queries will no longer be supported in the next minor release.", wc) - } - } - } - }() - return nil - }) - c.OnShutdown(func() error { - wildWarner.Stop() - return nil - }) - return nil }