diff options
| author |  Chris O'Haver <cohaver@infoblox.com>
| 2017-01-15 03:12:28 -0500 |
|---|---|---|
| committer |  Miek Gieben <miek@miek.nl>
| 2017-01-15 08:12:28 +0000 |
| commit | a6d232a622a2f83a5d5ea1d9d946da7f910a0f9e (patch) | |
| tree | 187a9366c8515bf1d8f6d483476555ea4f9897b8 /middleware/kubernetes/setup.go | |
| parent | b6a2a5aeaa0811199c6206eb87893eaa2298ae95 (diff) | |
| download | coredns-a6d232a622a2f83a5d5ea1d9d946da7f910a0f9e.tar.gz coredns-a6d232a622a2f83a5d5ea1d9d946da7f910a0f9e.tar.zst coredns-a6d232a622a2f83a5d5ea1d9d946da7f910a0f9e.zip | |
dont require/allow "_" prefix for srv wildcard fields (#472)
* dont require/allow "_" prefix for srv wildcard fields
* streamline parse/validation of req name
* removing nametemplate
* error when zone not found, loopify unit tests
Diffstat (limited to 'middleware/kubernetes/setup.go')
| -rw-r--r-- | middleware/kubernetes/setup.go | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/middleware/kubernetes/setup.go b/middleware/kubernetes/setup.go index 8c733a2df..0813ef7b3 100644 --- a/middleware/kubernetes/setup.go +++ b/middleware/kubernetes/setup.go @@ -8,7 +8,6 @@ import ( "github.com/miekg/coredns/core/dnsserver" "github.com/miekg/coredns/middleware" - "github.com/miekg/coredns/middleware/kubernetes/nametemplate" "github.com/mholt/caddy" unversionedapi "k8s.io/client-go/1.5/pkg/api/unversioned" @@ -52,8 +51,6 @@ func setup(c *caddy.Controller) error { func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) { k8s := &Kubernetes{ResyncPeriod: defaultResyncPeriod} - k8s.NameTemplate = new(nametemplate.Template) - k8s.NameTemplate.SetTemplate(defaultNameTemplate) k8s.PodMode = PodModeDisabled for c.Next() { @@ -99,18 +96,6 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) { continue } return nil, c.ArgErr() - - case "template": - args := c.RemainingArgs() - if len(args) > 0 { - template := strings.Join(args, "") - err := k8s.NameTemplate.SetTemplate(template) - if err != nil { - return nil, err - } - continue - } - return nil, c.ArgErr() case "namespaces": args := c.RemainingArgs() if len(args) > 0 { @@ -164,7 +149,6 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) { } const ( - defaultNameTemplate = "{service}.{namespace}.{type}.{zone}" defaultResyncPeriod = 5 * time.Minute defaultPodMode = PodModeDisabled ) |