diff options
| author |  Chris O'Haver <cohaver@infoblox.com>
| 2017-11-08 13:58:48 -0500 |
|---|---|---|
| committer |  Miek Gieben <miek@miek.nl>
| 2017-11-08 18:58:48 +0000 |
| commit | 1a96fd2aee28379540c05d6e7e3986123402d8d6 (patch) | |
| tree | ec7a4c80d58dbc1b0a086a5705118492e12ab7d6 | |
| parent | 5d3bfef732b9d10632c75bb1cec96c3c56e68d54 (diff) | |
| download | coredns-1a96fd2aee28379540c05d6e7e3986123402d8d6.tar.gz coredns-1a96fd2aee28379540c05d6e7e3986123402d8d6.tar.zst coredns-1a96fd2aee28379540c05d6e7e3986123402d8d6.zip | |
plugin/k8s: fix pods disabled behavior (#1207)
* fix pods disabled behavior
* do away with pod mode specific error
| -rw-r--r-- | plugin/kubernetes/handler_pod_disabled_test.go | 4 | ||||
| -rw-r--r-- | plugin/kubernetes/kubernetes.go | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/plugin/kubernetes/handler_pod_disabled_test.go b/plugin/kubernetes/handler_pod_disabled_test.go index 19dd84bdc..cf6ed50f5 100644 --- a/plugin/kubernetes/handler_pod_disabled_test.go +++ b/plugin/kubernetes/handler_pod_disabled_test.go @@ -14,7 +14,6 @@ var podModeDisabledCases = []test.Case{ { Qname: "10-240-0-1.podns.pod.cluster.local.", Qtype: dns.TypeA, Rcode: dns.RcodeNameError, - Error: errPodsDisabled, Ns: []dns.RR{ test.SOA("cluster.local. 300 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 60"), }, @@ -22,7 +21,6 @@ var podModeDisabledCases = []test.Case{ { Qname: "172-0-0-2.podns.pod.cluster.local.", Qtype: dns.TypeA, Rcode: dns.RcodeNameError, - Error: errPodsDisabled, Ns: []dns.RR{ test.SOA("cluster.local. 300 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 60"), }, @@ -44,7 +42,7 @@ func TestServeDNSModeDisabled(t *testing.T) { _, err := k.ServeDNS(ctx, w, r) if err != tc.Error { - t.Errorf("Test %d expected no error, got %v", i, err) + t.Errorf("Test %d got unexpected error %v", i, err) return } if tc.Error != nil { diff --git a/plugin/kubernetes/kubernetes.go b/plugin/kubernetes/kubernetes.go index ad89e1686..044541afb 100644 --- a/plugin/kubernetes/kubernetes.go +++ b/plugin/kubernetes/kubernetes.go @@ -77,7 +77,6 @@ var ( errNoItems = errors.New("no items found") errNsNotExposed = errors.New("namespace is not exposed") errInvalidRequest = errors.New("invalid query name") - errPodsDisabled = errors.New("pod records disabled") ) // Services implements the ServiceBackend interface. @@ -295,7 +294,7 @@ func endpointHostname(addr api.EndpointAddress, endpointNameMode bool) string { func (k *Kubernetes) findPods(r recordRequest, zone string) (pods []msg.Service, err error) { if k.podMode == podModeDisabled { - return nil, errPodsDisabled + return nil, errNoItems } namespace := r.namespace |