mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-06 01:26:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make unit tests more strict about record type

Browse Source
This commit is contained in:
John Gardiner Myers 2021-11-28 11:37:40 -08:00
parent ee546ae242
commit 06227c1fbf
8 changed files with 528 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/contour_httpproxy_test.go
View File

@ -221,6 +221,7 @@ func testEndpointsFromHTTPProxy(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -236,6 +237,7 @@ func testEndpointsFromHTTPProxy(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -252,10 +254,12 @@ func testEndpointsFromHTTPProxy(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8", "127.0.0.1"},
},
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"elb.com", "alb.com"},
},
},
@ -343,18 +347,22 @@ func testHTTPProxyEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -381,18 +389,22 @@ func testHTTPProxyEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -419,10 +431,12 @@ func testHTTPProxyEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -447,6 +461,7 @@ func testHTTPProxyEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -510,6 +525,7 @@ func testHTTPProxyEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -552,6 +568,7 @@ func testHTTPProxyEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -594,10 +611,12 @@ func testHTTPProxyEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "fake1.ext-dns.test.com",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "fake1.ext-dns.test.com",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"elb.com"},
},
},
@ -883,16 +902,19 @@ func testHTTPProxyEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"httpproxy-target.com"},
RecordTTL: endpoint.TTL(6),
},
{
DNSName: "example2.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"httpproxy-target.com"},
RecordTTL: endpoint.TTL(1),
},
{
DNSName: "example3.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"httpproxy-target.com"},
RecordTTL: endpoint.TTL(10),
},
@ -998,18 +1020,22 @@ func testHTTPProxyEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},

28
source/ingress_test.go
View File

@ -178,6 +178,7 @@ func testEndpointsFromIngress(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -191,6 +192,7 @@ func testEndpointsFromIngress(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -205,10 +207,12 @@ func testEndpointsFromIngress(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8", "127.0.0.1"},
},
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"elb.com", "alb.com"},
},
},
@ -271,10 +275,12 @@ func testEndpointsFromIngressHostnameSourceAnnotation(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "foo.baz",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -288,6 +294,7 @@ func testEndpointsFromIngressHostnameSourceAnnotation(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -302,10 +309,12 @@ func testEndpointsFromIngressHostnameSourceAnnotation(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "foo.baz",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -320,6 +329,7 @@ func testEndpointsFromIngressHostnameSourceAnnotation(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -334,6 +344,7 @@ func testEndpointsFromIngressHostnameSourceAnnotation(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.baz",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -388,10 +399,12 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -436,10 +449,12 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -464,6 +479,7 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -486,6 +502,7 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -543,6 +560,7 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -581,6 +599,7 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -619,10 +638,12 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "fake1.ext-dns.test.com",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "fake1.ext-dns.test.com",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"elb.com"},
},
},
@ -974,16 +995,19 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"ingress-target.com"},
RecordTTL: endpoint.TTL(6),
},
{
DNSName: "example2.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"ingress-target.com"},
RecordTTL: endpoint.TTL(1),
},
{
DNSName: "example3.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"ingress-target.com"},
RecordTTL: endpoint.TTL(10),
},
@ -1133,10 +1157,12 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -1170,6 +1196,7 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"1.2.3.4"},
},
},
@ -1190,6 +1217,7 @@ func testIngressEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},

30
source/istio_gateway_test.go
View File

@ -185,6 +185,7 @@ func testEndpointsFromGatewayConfig(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -204,6 +205,7 @@ func testEndpointsFromGatewayConfig(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -223,6 +225,7 @@ func testEndpointsFromGatewayConfig(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -243,10 +246,12 @@ func testEndpointsFromGatewayConfig(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8", "127.0.0.1"},
},
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"elb.com", "alb.com"},
},
},
@ -311,6 +316,7 @@ func testEndpointsFromGatewayConfig(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com", "lb2.com"},
},
},
@ -377,18 +383,22 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -417,18 +427,22 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -453,10 +467,12 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -483,6 +499,7 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -552,6 +569,7 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -598,6 +616,7 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -644,10 +663,12 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "fake1.ext-dns.test.com",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "fake1.ext-dns.test.com",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"elb.com"},
},
},
@ -949,16 +970,19 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"gateway-target.com"},
RecordTTL: endpoint.TTL(6),
},
{
DNSName: "example2.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"gateway-target.com"},
RecordTTL: endpoint.TTL(1),
},
{
DNSName: "example3.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"gateway-target.com"},
RecordTTL: endpoint.TTL(10),
},
@ -1070,18 +1094,22 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -1138,10 +1166,12 @@ func testGatewayEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "fake1.dns-through-hostname.com",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"1.2.3.4"},
},
{
DNSName: "fake2.dns-through-hostname.com",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"1.2.3.4"},
},
},

26
source/istio_virtualservice_test.go
View File

@ -395,6 +395,7 @@ func testEndpointsFromVirtualServiceConfig(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -417,6 +418,7 @@ func testEndpointsFromVirtualServiceConfig(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -440,10 +442,12 @@ func testEndpointsFromVirtualServiceConfig(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8", "127.0.0.1"},
},
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"elb.com", "alb.com"},
},
},
@ -544,6 +548,7 @@ func testEndpointsFromVirtualServiceConfig(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "foo.bar",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"elb.com", "alb.com"},
},
},
@ -619,18 +624,22 @@ func testVirtualServiceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -666,6 +675,7 @@ func testVirtualServiceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -703,18 +713,22 @@ func testVirtualServiceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -753,10 +767,12 @@ func testVirtualServiceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},
@ -791,6 +807,7 @@ func testVirtualServiceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -859,6 +876,7 @@ func testVirtualServiceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
},
@ -918,10 +936,12 @@ func testVirtualServiceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "vs1.ext-dns.test.com",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "vs1.ext-dns.test.com",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"elb.com"},
},
},
@ -1207,11 +1227,13 @@ func testVirtualServiceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
RecordTTL: endpoint.TTL(6),
},
{
DNSName: "example2.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
RecordTTL: endpoint.TTL(1),
},
@ -1323,18 +1345,22 @@ func testVirtualServiceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "example.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets{"8.8.8.8"},
},
{
DNSName: "new.org",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets{"lb.com"},
},
},

10
source/openshift_route_test.go
View File

@ -198,6 +198,7 @@ func testOcpRouteSourceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "my-domain.com",
RecordType: endpoint.RecordTypeCNAME,
Targets: []string{
"apps.my-domain.com",
},
@ -231,6 +232,7 @@ func testOcpRouteSourceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "my-domain.com",
RecordType: endpoint.RecordTypeCNAME,
Targets: []string{
"router-default.my-domain.com",
},
@ -275,6 +277,7 @@ func testOcpRouteSourceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "my-domain.com",
RecordType: endpoint.RecordTypeCNAME,
Targets: []string{
"router-default.my-domain.com",
},
@ -394,7 +397,10 @@ func testOcpRouteSourceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "my-domain.com",
Targets: []string{"router-test.my-domain.com"},
RecordType: endpoint.RecordTypeCNAME,
Targets: []string{
"router-test.my-domain.com",
},
},
},
},
@ -440,6 +446,7 @@ func testOcpRouteSourceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "my-annotation-domain.com",
RecordType: endpoint.RecordTypeCNAME,
Targets: []string{
"my.site.foo.com",
},
@ -480,6 +487,7 @@ func testOcpRouteSourceEndpoints(t *testing.T) {
expected: []*endpoint.Endpoint{
{
DNSName: "my-annotation-domain.com",
RecordType: endpoint.RecordTypeCNAME,
Targets: []string{
"my.site.foo.com",
},

188
source/service_test.go
View File

@ -232,7 +232,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -277,8 +277,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.fqdn.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.com", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.com", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -294,8 +294,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.fqdn.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.com", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.com", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -313,10 +313,10 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.com", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.com", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -335,8 +335,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.fqdn.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.com", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.fqdn.com", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -352,8 +352,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -369,8 +369,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -386,7 +386,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"lb.example.com"}, // Kubernetes omits the trailing dot
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"lb.example.com"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeCNAME, Targets: endpoint.Targets{"lb.example.com"}},
},
},
{
@ -402,8 +402,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4", "lb.example.com"}, // Kubernetes omits the trailing dot
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", Targets: endpoint.Targets{"lb.example.com"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeCNAME, Targets: endpoint.Targets{"lb.example.com"}},
},
},
{
@ -420,7 +420,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -453,7 +453,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -484,7 +484,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -502,7 +502,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -553,7 +553,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -599,7 +599,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"10.2.3.4", "11.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"10.2.3.4", "11.2.3.4"}},
},
},
{
@ -615,7 +615,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4", "8.8.8.8"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4", "8.8.8.8"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4", "8.8.8.8"}},
},
},
{
@ -646,7 +646,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -665,8 +665,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -683,8 +683,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4", "lb.example.com"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "internal.foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "internal.foo.example.org", Targets: endpoint.Targets{"lb.example.com"}},
{DNSName: "internal.foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "internal.foo.example.org", RecordType: endpoint.RecordTypeCNAME, Targets: endpoint.Targets{"lb.example.com"}},
},
},
{
@ -702,10 +702,10 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "internal.foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "internal.bar.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "internal.foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "internal.bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -720,8 +720,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4", "elb.com"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.bar.example.com", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.bar.example.com", Targets: endpoint.Targets{"elb.com"}},
{DNSName: "foo.bar.example.com", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.bar.example.com", RecordType: endpoint.RecordTypeCNAME, Targets: endpoint.Targets{"elb.com"}},
},
},
{
@ -738,8 +738,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4", "elb.com"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", Targets: endpoint.Targets{"elb.com"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeCNAME, Targets: endpoint.Targets{"elb.com"}},
},
},
{
@ -757,7 +757,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "mate.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "mate.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -787,7 +787,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(0)},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(0)},
},
},
{
@ -804,7 +804,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(0)},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(0)},
},
},
{
@ -821,7 +821,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(10)},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(10)},
},
},
{
@ -838,7 +838,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(60)},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(60)},
},
},
{
@ -855,7 +855,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(0)},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}, RecordTTL: endpoint.TTL(0)},
},
},
{
@ -871,7 +871,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{string(v1.ServiceTypeLoadBalancer)},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -902,7 +902,7 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.internal.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo.internal.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
},
},
{
@ -920,8 +920,8 @@ func testServiceSourceEndpoints(t *testing.T) {
lbs: []string{"1.2.3.4"},
serviceTypesFilter: []string{},
expected: []*endpoint.Endpoint{
{DNSName: "foo.internal.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.internal.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -939,7 +939,7 @@ func testServiceSourceEndpoints(t *testing.T) {
serviceLabelSelector: "app=web-external",
fqdnTemplate: "{{.Name}}.bar.example.com",
expected: []*endpoint.Endpoint{
{DNSName: "fqdn.bar.example.com", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "fqdn.bar.example.com", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -957,7 +957,7 @@ func testServiceSourceEndpoints(t *testing.T) {
serviceLabelSelector: "app=web-external",
annotations: map[string]string{hostnameAnnotationKey: "annotation.bar.example.com"},
expected: []*endpoint.Endpoint{
{DNSName: "annotation.bar.example.com", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "annotation.bar.example.com", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -1112,7 +1112,7 @@ func testMultipleServicesEndpoints(t *testing.T) {
},
[]string{},
[]*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo1.2.3.4"}},
},
false,
},
@ -1136,7 +1136,7 @@ func testMultipleServicesEndpoints(t *testing.T) {
},
[]string{},
[]*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4", "1.2.3.5", "1.2.3.6"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4", "1.2.3.5", "1.2.3.6"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo1.2.3.4"}},
},
false,
},
@ -1164,9 +1164,9 @@ func testMultipleServicesEndpoints(t *testing.T) {
},
[]string{},
[]*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4", "1.2.3.5", "1.2.3.6"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo1.2.3.4"}},
{DNSName: "bar.example.org", Targets: endpoint.Targets{"10.1.1.1", "10.1.1.2", "10.1.1.3"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo10.1.1.1"}},
{DNSName: "foobar.example.org", Targets: endpoint.Targets{"20.1.1.1"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo20.1.1.1"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4", "1.2.3.5", "1.2.3.6"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo1.2.3.4"}},
{DNSName: "bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"10.1.1.1", "10.1.1.2", "10.1.1.3"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo10.1.1.1"}},
{DNSName: "foobar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"20.1.1.1"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foo20.1.1.1"}},
},
false,
},
@ -1189,8 +1189,8 @@ func testMultipleServicesEndpoints(t *testing.T) {
},
[]string{},
[]*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"a.elb.com"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/fooa.elb.com"}, SetIdentifier: "a"},
{DNSName: "foo.example.org", Targets: endpoint.Targets{"b.elb.com"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foob.elb.com"}, SetIdentifier: "b"},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeCNAME, Targets: endpoint.Targets{"a.elb.com"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/fooa.elb.com"}, SetIdentifier: "a"},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeCNAME, Targets: endpoint.Targets{"b.elb.com"}, Labels: map[string]string{endpoint.ResourceLabelKey: "service/testing/foob.elb.com"}, SetIdentifier: "b"},
},
false,
},
@ -1304,7 +1304,7 @@ func TestClusterIpServices(t *testing.T) {
},
clusterIP: "1.2.3.4",
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
},
{
@ -1327,7 +1327,7 @@ func TestClusterIpServices(t *testing.T) {
fqdnTemplate: "{{.Name}}.bar.example.com",
clusterIP: "4.5.6.7",
expected: []*endpoint.Endpoint{
{DNSName: "foo.bar.example.com", Targets: endpoint.Targets{"4.5.6.7"}},
{DNSName: "foo.bar.example.com", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"4.5.6.7"}},
},
},
{
@ -1347,7 +1347,7 @@ func TestClusterIpServices(t *testing.T) {
labels: map[string]string{"app": "web-internal"},
clusterIP: "4.5.6.7",
expected: []*endpoint.Endpoint{
{DNSName: "foo.bar.example.com", Targets: endpoint.Targets{"4.5.6.7"}},
{DNSName: "foo.bar.example.com", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"4.5.6.7"}},
},
labelSelector: "app=web-internal",
},
@ -1748,8 +1748,8 @@ func TestServiceSourceNodePortServices(t *testing.T) {
kopsDNSControllerInternalHostnameAnnotationKey: "internal.foo.example.org., internal.bar.example.org",
},
expected: []*endpoint.Endpoint{
{DNSName: "internal.foo.example.org", Targets: endpoint.Targets{"10.0.1.1"}},
{DNSName: "internal.bar.example.org", Targets: endpoint.Targets{"10.0.1.1"}},
{DNSName: "internal.foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"10.0.1.1"}},
{DNSName: "internal.bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"10.0.1.1"}},
},
nodes: []*v1.Node{{
ObjectMeta: metav1.ObjectMeta{
@ -1790,8 +1790,8 @@ func TestServiceSourceNodePortServices(t *testing.T) {
kopsDNSControllerInternalHostnameAnnotationKey: "internal.foo.example.org., internal.bar.example.org",
},
expected: []*endpoint.Endpoint{
{DNSName: "internal.foo.example.org", Targets: endpoint.Targets{"10.0.1.1", "10.0.1.2"}},
{DNSName: "internal.bar.example.org", Targets: endpoint.Targets{"10.0.1.1", "10.0.1.2"}},
{DNSName: "internal.foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"10.0.1.1", "10.0.1.2"}},
{DNSName: "internal.bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"10.0.1.1", "10.0.1.2"}},
},
nodes: []*v1.Node{{
ObjectMeta: metav1.ObjectMeta{
@ -1832,8 +1832,8 @@ func TestServiceSourceNodePortServices(t *testing.T) {
kopsDNSControllerHostnameAnnotationKey: "foo.example.org., bar.example.org",
},
expected: []*endpoint.Endpoint{
{DNSName: "foo.example.org", Targets: endpoint.Targets{"54.10.11.1", "54.10.11.2"}},
{DNSName: "bar.example.org", Targets: endpoint.Targets{"54.10.11.1", "54.10.11.2"}},
{DNSName: "foo.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"54.10.11.1", "54.10.11.2"}},
{DNSName: "bar.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"54.10.11.1", "54.10.11.2"}},
},
nodes: []*v1.Node{{
ObjectMeta: metav1.ObjectMeta{
@ -2051,9 +2051,9 @@ func TestHeadlessServices(t *testing.T) {
false,
[]v1.Node{},
[]*endpoint.Endpoint{
{DNSName: "foo-0.service.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-1.service.example.org", Targets: endpoint.Targets{"1.1.1.2"}},
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
{DNSName: "foo-0.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-1.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.2"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
},
false,
},
@ -2114,9 +2114,9 @@ func TestHeadlessServices(t *testing.T) {
false,
[]v1.Node{},
[]*endpoint.Endpoint{
{DNSName: "foo-0.service.example.org", Targets: endpoint.Targets{"1.1.1.1"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "foo-1.service.example.org", Targets: endpoint.Targets{"1.1.1.2"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "foo-0.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "foo-1.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.2"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}, RecordTTL: endpoint.TTL(1)},
},
false,
},
@ -2147,8 +2147,8 @@ func TestHeadlessServices(t *testing.T) {
false,
[]v1.Node{},
[]*endpoint.Endpoint{
{DNSName: "foo-0.service.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-0.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
},
false,
},
@ -2179,9 +2179,9 @@ func TestHeadlessServices(t *testing.T) {
true,
[]v1.Node{},
[]*endpoint.Endpoint{
{DNSName: "foo-0.service.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-1.service.example.org", Targets: endpoint.Targets{"1.1.1.2"}},
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
{DNSName: "foo-0.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-1.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.2"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
},
false,
},
@ -2212,7 +2212,7 @@ func TestHeadlessServices(t *testing.T) {
false,
[]v1.Node{},
[]*endpoint.Endpoint{
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
},
false,
},
@ -2243,7 +2243,7 @@ func TestHeadlessServices(t *testing.T) {
false,
[]v1.Node{},
[]*endpoint.Endpoint{
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
},
false,
},
@ -2276,7 +2276,7 @@ func TestHeadlessServices(t *testing.T) {
false,
[]v1.Node{},
[]*endpoint.Endpoint{
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
false,
},
@ -2319,7 +2319,7 @@ func TestHeadlessServices(t *testing.T) {
},
},
[]*endpoint.Endpoint{
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
false,
},
@ -2351,7 +2351,7 @@ func TestHeadlessServices(t *testing.T) {
false,
[]v1.Node{},
[]*endpoint.Endpoint{
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.2.3.4"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.2.3.4"}},
},
false,
},
@ -2523,9 +2523,9 @@ func TestHeadlessServicesHostIP(t *testing.T) {
},
false,
[]*endpoint.Endpoint{
{DNSName: "foo-0.service.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-1.service.example.org", Targets: endpoint.Targets{"1.1.1.2"}},
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
{DNSName: "foo-0.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-1.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.2"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
},
false,
},
@ -2588,9 +2588,9 @@ func TestHeadlessServicesHostIP(t *testing.T) {
},
false,
[]*endpoint.Endpoint{
{DNSName: "foo-0.service.example.org", Targets: endpoint.Targets{"1.1.1.1"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "foo-1.service.example.org", Targets: endpoint.Targets{"1.1.1.2"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "foo-0.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "foo-1.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.2"}, RecordTTL: endpoint.TTL(1)},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}, RecordTTL: endpoint.TTL(1)},
},
false,
},
@ -2622,8 +2622,8 @@ func TestHeadlessServicesHostIP(t *testing.T) {
},
false,
[]*endpoint.Endpoint{
{DNSName: "foo-0.service.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-0.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
},
false,
},
@ -2655,9 +2655,9 @@ func TestHeadlessServicesHostIP(t *testing.T) {
},
true,
[]*endpoint.Endpoint{
{DNSName: "foo-0.service.example.org", Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-1.service.example.org", Targets: endpoint.Targets{"1.1.1.2"}},
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
{DNSName: "foo-0.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1"}},
{DNSName: "foo-1.service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.2"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
},
false,
},
@ -2689,7 +2689,7 @@ func TestHeadlessServicesHostIP(t *testing.T) {
},
false,
[]*endpoint.Endpoint{
{DNSName: "service.example.org", Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
{DNSName: "service.example.org", RecordType: endpoint.RecordTypeA, Targets: endpoint.Targets{"1.1.1.1", "1.1.1.2"}},
},
false,
},

2
source/shared_test.go
View File

@ -79,7 +79,7 @@ func validateEndpoint(t *testing.T, endpoint, expected *endpoint.Endpoint) {
}
// if non-empty record type is expected, check that it matches.
if expected.RecordType != "" && endpoint.RecordType != expected.RecordType {
if endpoint.RecordType != expected.RecordType {
t.Errorf("RecordType expected %q, got %q", expected.RecordType, endpoint.RecordType)
}

25
source/skipper_routegroup_test.go
View File

@ -91,6 +91,7 @@ func TestEndpointsFromRouteGroups(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -114,10 +115,12 @@ func TestEndpointsFromRouteGroups(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
{
DNSName: "my.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -141,6 +144,7 @@ func TestEndpointsFromRouteGroups(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -164,6 +168,7 @@ func TestEndpointsFromRouteGroups(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
RecordTTL: endpoint.TTL(2189),
},
@ -186,6 +191,7 @@ func TestEndpointsFromRouteGroups(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets([]string{"1.5.1.4"}),
},
},
@ -208,10 +214,12 @@ func TestEndpointsFromRouteGroups(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets([]string{"1.5.1.4"}),
},
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -279,6 +287,7 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -309,10 +318,12 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
{
DNSName: "rg1.namespace1.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -342,6 +353,7 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.namespace1.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -371,6 +383,7 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -401,6 +414,7 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
RecordTTL: endpoint.TTL(2189),
},
@ -431,10 +445,12 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeA,
Targets: endpoint.Targets([]string{"1.5.1.4"}),
},
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -496,18 +512,22 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
{
DNSName: "rg2.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
{
DNSName: "rg3.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
{
DNSName: "rg.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb2.example.org"}),
},
},
@ -576,6 +596,7 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -644,10 +665,12 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
{
DNSName: "rg2.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},
@ -702,10 +725,12 @@ func TestRouteGroupsEndpoints(t *testing.T) {
want: []*endpoint.Endpoint{
{
DNSName: "rg1.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
{
DNSName: "rg3.k8s.example",
RecordType: endpoint.RecordTypeCNAME,
Targets: endpoint.Targets([]string{"lb.example.org"}),
},
},