From 61fc672e1939df3dd365c9d836427d8eec1e5e7d Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Wed, 23 Aug 2017 07:19:41 +0100 Subject: mw/kubernetes: remove kPod and kServices (#969) Based up on: #939, but redone in a new PR with some cherry-picked commits: aacb91ef0b927683b21d6ee39dbddbd001334854 5dc34247b7d0136d9fe035f6b10d6b3e14ee7f2c This removes kPod and Kservice and creates []msg.Service from k.findPods and k.findServices. Updated few tests which I *think* are correct; they look correct to me. --- middleware/kubernetes/parse_test.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'middleware/kubernetes/parse_test.go') diff --git a/middleware/kubernetes/parse_test.go b/middleware/kubernetes/parse_test.go index e44fb09f4..06d5a2aaa 100644 --- a/middleware/kubernetes/parse_test.go +++ b/middleware/kubernetes/parse_test.go @@ -9,8 +9,6 @@ import ( ) func TestParseRequest(t *testing.T) { - k := New([]string{zone}) - tests := []struct { query string expected string // output from r.String() @@ -27,7 +25,7 @@ func TestParseRequest(t *testing.T) { m.SetQuestion(tc.query, dns.TypeA) state := request.Request{Zone: zone, Req: m} - r, e := k.parseRequest(state) + r, e := parseRequest(state) if e != nil { t.Errorf("Test %d, expected no error, got '%v'.", i, e) } @@ -39,8 +37,6 @@ func TestParseRequest(t *testing.T) { } func TestParseInvalidRequest(t *testing.T) { - k := New([]string{zone}) - invalid := []string{ "webs.mynamespace.pood.inter.webs.test.", // Request must be for pod or svc subdomain. "too.long.for.what.I.am.trying.to.pod.inter.webs.tests.", // Too long. @@ -51,7 +47,7 @@ func TestParseInvalidRequest(t *testing.T) { m.SetQuestion(query, dns.TypeA) state := request.Request{Zone: zone, Req: m} - if _, e := k.parseRequest(state); e == nil { + if _, e := parseRequest(state); e == nil { t.Errorf("Test %d: expected error from %s, got none", i, query) } } -- cgit v1.2.3