This reverts commit 744468ea78
.
This commit is contained in:
parent
4349b6fa63
commit
4693f40990
3 changed files with 0 additions and 33 deletions
|
@ -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" }
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue