diff options
| author |  Chris O'Haver <cohaver@infoblox.com>
| 2017-07-11 18:05:32 -0400 |
|---|---|---|
| committer |  John Belamaric <jbelamaric@infoblox.com>
| 2017-07-11 18:05:32 -0400 |
| commit | 8495e48297856d902a6f2791e1629f8a7ac8a1c7 (patch) | |
| tree | d67348c2d1a7c49849461a96aafebe9bd8c88a33 /middleware/kubernetes/kubernetes.go | |
| parent | 0049230a935b8e45ffcb290723a3a17df4b59f77 (diff) | |
| download | coredns-8495e48297856d902a6f2791e1629f8a7ac8a1c7.tar.gz coredns-8495e48297856d902a6f2791e1629f8a7ac8a1c7.tar.zst coredns-8495e48297856d902a6f2791e1629f8a7ac8a1c7.zip | |
k8s/autopath: Add CNAMES (#771)
* Add unit tests & cnames
* more progress
* fix
* next mw dependent unit tests
* add tests for OnNXDOMAIN
* Add AAAA and ndots unit tests; fix request.NewWithQuestion
* Correct default value in README
* add CNAMEs to readme
* review
* fix autopath examples
* fix and test CNAME response order
Diffstat (limited to 'middleware/kubernetes/kubernetes.go')
| -rw-r--r-- | middleware/kubernetes/kubernetes.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go index 13f92adca..a65b3710b 100644 --- a/middleware/kubernetes/kubernetes.go +++ b/middleware/kubernetes/kubernetes.go @@ -110,13 +110,14 @@ var errResolvConfReadErr = errors.New("resolv.conf read error") // Services implements the ServiceBackend interface. func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.Options) (svcs []msg.Service, debug []msg.Service, err error) { - r, e := k.parseRequest(state.Name(), state.QType()) if e != nil { return nil, nil, e } - switch state.Type() { + case "AAAA": + // AAAA not implemented + return nil, nil, errNoItems case "A", "CNAME": if state.Type() == "A" && isDefaultNS(state.Name(), r) { // If this is an A request for "ns.dns", respond with a "fake" record for coredns. @@ -362,7 +363,6 @@ func (k *Kubernetes) Entries(r recordRequest) ([]msg.Service, error) { if (!symbolContainsWildcard(r.namespace)) && (len(k.Namespaces) > 0) && (!dnsstrings.StringInSlice(r.namespace, k.Namespaces)) { return nil, errNsNotExposed } - services, pods, err := k.get(r) if err != nil { return nil, err @@ -464,7 +464,7 @@ func ipFromPodName(podname string) string { } func (k *Kubernetes) findPodWithIP(ip string) (p *api.Pod) { - if k.PodMode != PodModeVerified { + if !k.AutoPath.Enabled { return nil } objList := k.APIConn.PodIndex(ip) @@ -533,7 +533,6 @@ func (k *Kubernetes) get(r recordRequest) (services []service, pods []pod, err e func (k *Kubernetes) findServices(r recordRequest) ([]service, error) { serviceList := k.APIConn.ServiceList() - var resultItems []service nsWildcard := symbolContainsWildcard(r.namespace) |