5f41d8eb1f
Make normalize return multiple "hosts" (= reverse zones) when a non-octet boundary cidr is given. Added pkg/cidr package that holds the cidr calculation routines; felt they didn't really fit dnsutil. This change means the IPNet return parameter isn't needed, the hosts are all correct. The tests that tests this is also removed: TestSplitHostPortReverse The fallout was that zoneAddr _also_ doesn't need the IPNet member, that in turn make it visible that zoneAddr in address.go duplicated a bunch of stuff from register.go; removed/refactored that too. Created a plugin.OriginsFromArgsOrServerBlock to help plugins do the right things, by consuming ZONE arguments; this now expands reverse zones correctly. This is mostly mechanical. Remove the reverse test in plugin/kubernetes which is a copy-paste from a core test (which has since been fixed). Remove MustNormalize as it has no plugin users. This change is not backwards compatible to plugins that have a ZONE argument that they parse in the setup util. All in-tree plugins have been updated. Signed-off-by: Miek Gieben <miek@miek.nl>
75 lines
1.6 KiB
Go
75 lines
1.6 KiB
Go
package external
|
|
|
|
import (
|
|
"strconv"
|
|
|
|
"github.com/coredns/caddy"
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/plugin"
|
|
"github.com/coredns/coredns/plugin/pkg/upstream"
|
|
)
|
|
|
|
func init() { plugin.Register("k8s_external", setup) }
|
|
|
|
func setup(c *caddy.Controller) error {
|
|
e, err := parse(c)
|
|
if err != nil {
|
|
return plugin.Error("k8s_external", err)
|
|
}
|
|
|
|
// Do this in OnStartup, so all plugins have been initialized.
|
|
c.OnStartup(func() error {
|
|
m := dnsserver.GetConfig(c).Handler("kubernetes")
|
|
if m == nil {
|
|
return nil
|
|
}
|
|
if x, ok := m.(Externaler); ok {
|
|
e.externalFunc = x.External
|
|
e.externalAddrFunc = x.ExternalAddress
|
|
}
|
|
return nil
|
|
})
|
|
|
|
e.upstream = upstream.New()
|
|
|
|
dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
|
|
e.Next = next
|
|
return e
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func parse(c *caddy.Controller) (*External, error) {
|
|
e := New()
|
|
|
|
for c.Next() { // external
|
|
e.Zones = plugin.OriginsFromArgsOrServerBlock(c.RemainingArgs(), c.ServerBlockKeys)
|
|
for c.NextBlock() {
|
|
switch c.Val() {
|
|
case "ttl":
|
|
args := c.RemainingArgs()
|
|
if len(args) == 0 {
|
|
return nil, c.ArgErr()
|
|
}
|
|
t, err := strconv.Atoi(args[0])
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if t < 0 || t > 3600 {
|
|
return nil, c.Errf("ttl must be in range [0, 3600]: %d", t)
|
|
}
|
|
e.ttl = uint32(t)
|
|
case "apex":
|
|
args := c.RemainingArgs()
|
|
if len(args) == 0 {
|
|
return nil, c.ArgErr()
|
|
}
|
|
e.apex = args[0]
|
|
default:
|
|
return nil, c.Errf("unknown property '%s'", c.Val())
|
|
}
|
|
}
|
|
}
|
|
return e, nil
|
|
}
|