diff options
Diffstat (limited to 'plugin/kubernetes')
-rw-r--r-- | plugin/kubernetes/controller.go | 2 | ||||
-rw-r--r-- | plugin/kubernetes/handler_ignore_emptyservice_test.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/handler_pod_disabled_test.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/handler_pod_insecure_test.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/handler_pod_verified_test.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/handler_test.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/kubernetes.go | 3 | ||||
-rw-r--r-- | plugin/kubernetes/kubernetes_apex_test.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/ns_test.go | 6 | ||||
-rw-r--r-- | plugin/kubernetes/object/service.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/parse.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/reverse.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/reverse_test.go | 2 | ||||
-rw-r--r-- | plugin/kubernetes/setup.go | 1 | ||||
-rw-r--r-- | plugin/kubernetes/xfr.go | 1 |
15 files changed, 0 insertions, 24 deletions
diff --git a/plugin/kubernetes/controller.go b/plugin/kubernetes/controller.go index f8c2ee144..a34b64143 100644 --- a/plugin/kubernetes/controller.go +++ b/plugin/kubernetes/controller.go @@ -755,5 +755,3 @@ func (dns *dnsControl) updateExtModifed() { } var errObj = errors.New("obj was not of the correct type") - -const defaultResyncPeriod = 0 diff --git a/plugin/kubernetes/handler_ignore_emptyservice_test.go b/plugin/kubernetes/handler_ignore_emptyservice_test.go index ee5a4e88c..7af77fe1b 100644 --- a/plugin/kubernetes/handler_ignore_emptyservice_test.go +++ b/plugin/kubernetes/handler_ignore_emptyservice_test.go @@ -30,7 +30,6 @@ var dnsEmptyServiceTestCases = []test.Case{ } func TestServeDNSEmptyService(t *testing.T) { - k := New([]string{"cluster.local."}) k.APIConn = &APIConnServeTest{} k.opts.ignoreEmptyService = true diff --git a/plugin/kubernetes/handler_pod_disabled_test.go b/plugin/kubernetes/handler_pod_disabled_test.go index 9a7f2745a..be7e7a37b 100644 --- a/plugin/kubernetes/handler_pod_disabled_test.go +++ b/plugin/kubernetes/handler_pod_disabled_test.go @@ -28,7 +28,6 @@ var podModeDisabledCases = []test.Case{ } func TestServeDNSModeDisabled(t *testing.T) { - k := New([]string{"cluster.local."}) k.APIConn = &APIConnServeTest{} k.Next = test.NextHandler(dns.RcodeSuccess, nil) diff --git a/plugin/kubernetes/handler_pod_insecure_test.go b/plugin/kubernetes/handler_pod_insecure_test.go index 43c7b7940..b01d53f9e 100644 --- a/plugin/kubernetes/handler_pod_insecure_test.go +++ b/plugin/kubernetes/handler_pod_insecure_test.go @@ -63,7 +63,6 @@ var podModeInsecureCases = []test.Case{ } func TestServeDNSModeInsecure(t *testing.T) { - k := New([]string{"cluster.local."}) k.APIConn = &APIConnServeTest{} k.Next = test.NextHandler(dns.RcodeSuccess, nil) diff --git a/plugin/kubernetes/handler_pod_verified_test.go b/plugin/kubernetes/handler_pod_verified_test.go index 668ce5260..c8b09c4f5 100644 --- a/plugin/kubernetes/handler_pod_verified_test.go +++ b/plugin/kubernetes/handler_pod_verified_test.go @@ -49,7 +49,6 @@ var podModeVerifiedCases = []test.Case{ } func TestServeDNSModeVerified(t *testing.T) { - k := New([]string{"cluster.local."}) k.APIConn = &APIConnServeTest{} k.Next = test.NextHandler(dns.RcodeSuccess, nil) diff --git a/plugin/kubernetes/handler_test.go b/plugin/kubernetes/handler_test.go index d991f79d6..ecf47887f 100644 --- a/plugin/kubernetes/handler_test.go +++ b/plugin/kubernetes/handler_test.go @@ -494,7 +494,6 @@ var notSyncedTestCases = []test.Case{ } func TestNotSyncedServeDNS(t *testing.T) { - k := New([]string{"cluster.local."}) k.APIConn = &APIConnServeTest{ notSynced: true, diff --git a/plugin/kubernetes/kubernetes.go b/plugin/kubernetes/kubernetes.go index 3c80097e9..c6459fdaa 100644 --- a/plugin/kubernetes/kubernetes.go +++ b/plugin/kubernetes/kubernetes.go @@ -96,7 +96,6 @@ var ( func (k *Kubernetes) Services(ctx context.Context, state request.Request, exact bool, opt plugin.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() { - case dns.TypeTXT: // 1 label + zone, label must be "dns-version". t, _ := dnsutil.TrimZone(state.Name(), state.Zone) @@ -216,7 +215,6 @@ func (k *Kubernetes) getClientConfig() (*rest.Config, error) { } cc.ContentType = "application/vnd.kubernetes.protobuf" return cc, err - } // InitKubeCache initializes a new Kubernetes cache. @@ -542,7 +540,6 @@ func (k *Kubernetes) findServices(r recordRequest, zone string) (services []msg. for _, eps := range ep.Subsets { for _, addr := range eps.Addresses { - // See comments in parse.go parseRequest about the endpoint handling. if r.endpoint != "" { if !match(r.endpoint, endpointHostname(addr, k.endpointNameMode)) { diff --git a/plugin/kubernetes/kubernetes_apex_test.go b/plugin/kubernetes/kubernetes_apex_test.go index 5d2f4079b..7531e2141 100644 --- a/plugin/kubernetes/kubernetes_apex_test.go +++ b/plugin/kubernetes/kubernetes_apex_test.go @@ -60,7 +60,6 @@ var kubeApexCases = []test.Case{ } func TestServeDNSApex(t *testing.T) { - k := New([]string{"cluster.local."}) k.APIConn = &APIConnServeTest{} k.Next = test.NextHandler(dns.RcodeSuccess, nil) diff --git a/plugin/kubernetes/ns_test.go b/plugin/kubernetes/ns_test.go index abc5fa935..3ad12cb29 100644 --- a/plugin/kubernetes/ns_test.go +++ b/plugin/kubernetes/ns_test.go @@ -99,7 +99,6 @@ func (APIConnTest) GetNamespaceByName(name string) (*object.Namespace, error) { } func TestNsAddrs(t *testing.T) { - k := New([]string{"inter.webs.test."}) k.APIConn = &APIConnTest{} k.localIPs = []net.IP{net.ParseIP("10.244.0.20")} @@ -108,7 +107,6 @@ func TestNsAddrs(t *testing.T) { if len(cdrs) != 3 { t.Fatalf("Expected 3 results, got %v", len(cdrs)) - } cdr := cdrs[0] expected := "10.0.0.111" @@ -140,7 +138,6 @@ func TestNsAddrs(t *testing.T) { } func TestNsAddrsExternal(t *testing.T) { - k := New([]string{"example.com."}) k.APIConn = &APIConnTest{} k.localIPs = []net.IP{net.ParseIP("10.244.0.20")} @@ -150,7 +147,6 @@ func TestNsAddrsExternal(t *testing.T) { if len(cdrs) != 0 { t.Fatalf("Expected 0 results, got %v", len(cdrs)) - } // Add an external IP to one of the services ... @@ -159,7 +155,6 @@ func TestNsAddrsExternal(t *testing.T) { if len(cdrs) != 1 { t.Fatalf("Expected 1 results, got %v", len(cdrs)) - } cdr := cdrs[0] expected := "1.2.3.4" @@ -170,5 +165,4 @@ func TestNsAddrsExternal(t *testing.T) { if cdr.Header().Name != expected { t.Errorf("Expected record name to be %q, got %q", expected, cdr.Header().Name) } - } diff --git a/plugin/kubernetes/object/service.go b/plugin/kubernetes/object/service.go index 812b272e2..bd3e3d335 100644 --- a/plugin/kubernetes/object/service.go +++ b/plugin/kubernetes/object/service.go @@ -68,7 +68,6 @@ func ToService(obj meta.Object) (meta.Object, error) { continue } s.ExternalIPs[li+i] = lb.Hostname - } *svc = api.Service{} diff --git a/plugin/kubernetes/parse.go b/plugin/kubernetes/parse.go index 1c072a649..4690c814b 100644 --- a/plugin/kubernetes/parse.go +++ b/plugin/kubernetes/parse.go @@ -66,7 +66,6 @@ func parseRequest(name, zone string) (r recordRequest, err error) { // Because of ambiguity we check the labels left: 1: an endpoint. 2: port and protocol. // Anything else is a query that is too long to answer and can safely be delegated to return an nxdomain. switch last { - case 0: // endpoint only r.endpoint = segs[last] case 1: // service and port diff --git a/plugin/kubernetes/reverse.go b/plugin/kubernetes/reverse.go index 2a5c5cdce..26fc3b429 100644 --- a/plugin/kubernetes/reverse.go +++ b/plugin/kubernetes/reverse.go @@ -12,7 +12,6 @@ import ( // Reverse implements the ServiceBackend interface. func (k *Kubernetes) Reverse(ctx context.Context, state request.Request, exact bool, opt plugin.Options) ([]msg.Service, error) { - ip := dnsutil.ExtractAddressFromReverse(state.Name()) if ip == "" { _, e := k.Records(ctx, state, exact) diff --git a/plugin/kubernetes/reverse_test.go b/plugin/kubernetes/reverse_test.go index b1835b3c8..370b9f9b5 100644 --- a/plugin/kubernetes/reverse_test.go +++ b/plugin/kubernetes/reverse_test.go @@ -38,7 +38,6 @@ func (APIConnReverseTest) SvcIndex(svc string) []*object.Service { }, } return svcs - } func (APIConnReverseTest) SvcIndexReverse(ip string) []*object.Service { @@ -150,7 +149,6 @@ func (APIConnReverseTest) GetNamespaceByName(name string) (*object.Namespace, er } func TestReverse(t *testing.T) { - k := New([]string{"cluster.local.", "0.10.in-addr.arpa.", "168.192.in-addr.arpa.", "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.c.b.a.4.3.2.1.ip6.arpa.", "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.3.0.0.7.7.0.0.0.0.d.f.ip6.arpa."}) k.APIConn = &APIConnReverseTest{} diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go index 4d7bfcf03..d7f11e1a7 100644 --- a/plugin/kubernetes/setup.go +++ b/plugin/kubernetes/setup.go @@ -87,7 +87,6 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) { // ParseStanza parses a kubernetes stanza func ParseStanza(c *caddy.Controller) (*Kubernetes, error) { - k8s := New([]string{""}) k8s.autoPathSearch = searchFromResolvConf() diff --git a/plugin/kubernetes/xfr.go b/plugin/kubernetes/xfr.go index 38899acf0..e29a4a7a7 100644 --- a/plugin/kubernetes/xfr.go +++ b/plugin/kubernetes/xfr.go @@ -63,7 +63,6 @@ func (k *Kubernetes) Transfer(zone string, serial uint32) (<-chan []dns.RR, erro } svcBase := []string{zonePath, Svc, svc.Namespace, svc.Name} switch svc.Type { - case api.ServiceTypeClusterIP, api.ServiceTypeNodePort, api.ServiceTypeLoadBalancer: clusterIP := net.ParseIP(svc.ClusterIPs[0]) if clusterIP != nil { |