4 files changed, 25 insertions, 30 deletions

diff --git a/middleware/kubernetes/handler.go b/middleware/kubernetes/handler.go
index 58aecfe1a..e83ab3d7d 100644
--- a/middleware/kubernetes/handler.go
+++ b/middleware/kubernetes/handler.go
@@ -32,44 +32,44 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
 
 	switch state.Type() {
 	case "A":
-		records, _, err = middleware.A(&k, zone, state, nil, middleware.Options{})
+		records, err = middleware.A(&k, zone, state, nil, middleware.Options{})
 	case "AAAA":
-		records, _, err = middleware.AAAA(&k, zone, state, nil, middleware.Options{})
+		records, err = middleware.AAAA(&k, zone, state, nil, middleware.Options{})
 	case "TXT":
-		records, _, err = middleware.TXT(&k, zone, state, middleware.Options{})
+		records, err = middleware.TXT(&k, zone, state, middleware.Options{})
 	case "CNAME":
-		records, _, err = middleware.CNAME(&k, zone, state, middleware.Options{})
+		records, err = middleware.CNAME(&k, zone, state, middleware.Options{})
 	case "PTR":
-		records, _, err = middleware.PTR(&k, zone, state, middleware.Options{})
+		records, err = middleware.PTR(&k, zone, state, middleware.Options{})
 	case "MX":
-		records, extra, _, err = middleware.MX(&k, zone, state, middleware.Options{})
+		records, extra, err = middleware.MX(&k, zone, state, middleware.Options{})
 	case "SRV":
-		records, extra, _, err = middleware.SRV(&k, zone, state, middleware.Options{})
+		records, extra, err = middleware.SRV(&k, zone, state, middleware.Options{})
 	case "SOA":
-		records, _, err = middleware.SOA(&k, zone, state, middleware.Options{})
+		records, err = middleware.SOA(&k, zone, state, middleware.Options{})
 	case "NS":
 		if state.Name() == zone {
-			records, extra, _, err = middleware.NS(&k, zone, state, middleware.Options{})
+			records, extra, err = middleware.NS(&k, zone, state, middleware.Options{})
 			break
 		}
 		fallthrough
 	default:
 		// Do a fake A lookup, so we can distinguish between NODATA and NXDOMAIN
-		_, _, err = middleware.A(&k, zone, state, nil, middleware.Options{})
+		_, err = middleware.A(&k, zone, state, nil, middleware.Options{})
 	}
 
 	if k.IsNameError(err) {
 		if k.Fallthrough {
 			return middleware.NextOrFailure(k.Name(), k.Next, ctx, w, r)
 		}
-		return middleware.BackendError(&k, zone, dns.RcodeNameError, state, nil /*debug*/, nil /* err */, middleware.Options{})
+		return middleware.BackendError(&k, zone, dns.RcodeNameError, state, nil /* err */, middleware.Options{})
 	}
 	if err != nil {
 		return dns.RcodeServerFailure, err
 	}
 
 	if len(records) == 0 {
-		return middleware.BackendError(&k, zone, dns.RcodeSuccess, state, nil /*debug*/, nil, middleware.Options{})
+		return middleware.BackendError(&k, zone, dns.RcodeSuccess, state, nil, middleware.Options{})
 	}
 
 	m.Answer = append(m.Answer, records...)
diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go
index 42c68e580..fe58df74d 100644
--- a/middleware/kubernetes/kubernetes.go
+++ b/middleware/kubernetes/kubernetes.go
@@ -81,7 +81,7 @@ var (
 )
 
 // 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) {
+func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.Options) (svcs []msg.Service, err error) {
 
 	// We're looking again at types, which we've already done in ServeDNS, but there are some types k8s just can't answer.
 	switch state.QType() {
@@ -92,19 +92,19 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.
 
 		segs := dns.SplitDomainName(t)
 		if len(segs) != 1 {
-			return nil, nil, fmt.Errorf("kubernetes: TXT query can only be for dns-version: %s", state.QName())
+			return nil, fmt.Errorf("kubernetes: TXT query can only be for dns-version: %s", state.QName())
 		}
 		if segs[0] != "dns-version" {
-			return nil, nil, nil
+			return nil, nil
 		}
 		svc := msg.Service{Text: DNSSchemaVersion, TTL: 28800, Key: msg.Path(state.QName(), "coredns")}
-		return []msg.Service{svc}, nil, nil
+		return []msg.Service{svc}, nil
 
 	case dns.TypeNS:
 		// We can only get here if the qname equal the zone, see ServeDNS in handler.go.
 		ns := k.nsAddr()
 		svc := msg.Service{Host: ns.A.String(), Key: msg.Path(state.QName(), "coredns")}
-		return []msg.Service{svc}, nil, nil
+		return []msg.Service{svc}, nil
 	}
 
 	if state.QType() == dns.TypeA && isDefaultNS(state.Name(), state.Zone) {
@@ -112,7 +112,7 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.
 		// SOA records always use this hardcoded name
 		ns := k.nsAddr()
 		svc := msg.Service{Host: ns.A.String(), Key: msg.Path(state.QName(), "coredns")}
-		return []msg.Service{svc}, nil, nil
+		return []msg.Service{svc}, nil
 	}
 
 	s, e := k.Records(state, false)
@@ -120,7 +120,7 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.
 	// SRV for external services is not yet implemented, so remove those records.
 
 	if state.QType() != dns.TypeSRV {
-		return s, nil, e
+		return s, e
 	}
 
 	internal := []msg.Service{}
@@ -130,13 +130,11 @@ func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.
 		}
 	}
 
-	return internal, nil, e
+	return internal, e
 }
 
 // primaryZone will return the first non-reverse zone being handled by this middleware
-func (k *Kubernetes) primaryZone() string {
-	return k.Zones[k.primaryZoneIndex]
-}
+func (k *Kubernetes) primaryZone() string { return k.Zones[k.primaryZoneIndex] }
 
 // Lookup implements the ServiceBackend interface.
 func (k *Kubernetes) Lookup(state request.Request, name string, typ uint16) (*dns.Msg, error) {
@@ -148,9 +146,6 @@ func (k *Kubernetes) IsNameError(err error) bool {
 	return err == errNoItems || err == errNsNotExposed || err == errInvalidRequest
 }
 
-// Debug implements the ServiceBackend interface.
-func (k *Kubernetes) Debug() string { return "debug" }
-
 func (k *Kubernetes) getClientConfig() (*rest.Config, error) {
 	loadingRules := &clientcmd.ClientConfigLoadingRules{}
 	overrides := &clientcmd.ConfigOverrides{}
diff --git a/middleware/kubernetes/kubernetes_test.go b/middleware/kubernetes/kubernetes_test.go
index 3e6d78f7c..573a517b1 100644
--- a/middleware/kubernetes/kubernetes_test.go
+++ b/middleware/kubernetes/kubernetes_test.go
@@ -222,7 +222,7 @@ func TestServices(t *testing.T) {
 			Req:  &dns.Msg{Question: []dns.Question{{Name: test.qname, Qtype: test.qtype}}},
 			Zone: "interwebs.test.", // must match from k.Zones[0]
 		}
-		svcs, _, e := k.Services(state, false, middleware.Options{})
+		svcs, e := k.Services(state, false, middleware.Options{})
 		if e != nil {
 			t.Errorf("Test %d: got error '%v'", i, e)
 			continue
diff --git a/middleware/kubernetes/reverse.go b/middleware/kubernetes/reverse.go
index eac5a0b04..25ece8035 100644
--- a/middleware/kubernetes/reverse.go
+++ b/middleware/kubernetes/reverse.go
@@ -10,15 +10,15 @@ import (
 )
 
 // Reverse implements the ServiceBackend interface.
-func (k *Kubernetes) Reverse(state request.Request, exact bool, opt middleware.Options) ([]msg.Service, []msg.Service, error) {
+func (k *Kubernetes) Reverse(state request.Request, exact bool, opt middleware.Options) ([]msg.Service, error) {
 
 	ip := dnsutil.ExtractAddressFromReverse(state.Name())
 	if ip == "" {
-		return nil, nil, nil
+		return nil, nil
 	}
 
 	records := k.serviceRecordForIP(ip, state.Name())
-	return records, nil, nil
+	return records, nil
 }
 
 // serviceRecordForIP gets a service record with a cluster ip matching the ip argument