Fix SRV records not returned for clusterset IP service

With clusterset IP enabled, we extract the ports from the aggregated ServiceImport instead of the EndpointSlices. However the ports are populated in the ServiceImport sometime after creation so PutServiceImport needs to update the cached spec if it already exists. Signed-off-by: Tom Pantelis <[email protected]>
submariner-io · Nov 22, 2024 · 0c8321d · 0c8321d
1 parent e499e76
commit 0c8321d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/coredns/plugin/handler_test.go b/coredns/plugin/handler_test.go
@@ -975,10 +975,12 @@ func testClusterSetIP() {
 
 		si := newServiceImport(namespace1, service1, mcsv1a1.ClusterSetIP)
 		si.Spec.IPs = []string{clusterSetIP}
-		si.Spec.Ports = []mcsv1a1.ServicePort{port1, port2}
 
 		t.lh.Resolver.PutServiceImport(si)
 
+		si.Spec.Ports = []mcsv1a1.ServicePort{port1, port2}
+		t.lh.Resolver.PutServiceImport(si)
+
 		t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
 			newEndpoint(serviceIP, "", true)))
 
@@ -999,7 +1001,7 @@ func testClusterSetIP() {
 		})
 	})
 
-	Specify("DNS query of Type SRV should succeed and write an SRV record response", func() {
+	FSpecify("DNS query of Type SRV should succeed and write an SRV record response", func() {
 		t.executeTestCase(rec, test.Case{
 			Qname: qname,
 			Qtype: dns.TypeSRV,

diff --git a/coredns/resolver/service_import.go b/coredns/resolver/service_import.go
@@ -43,13 +43,13 @@ func (i *Interface) PutServiceImport(serviceImport *mcsv1a1.ServiceImport) {
 			balancer: loadbalancer.NewSmoothWeightedRR(),
 		}
 
-		if !isLegacy {
-			svcInfo.spec = serviceImport.Spec
-		}
-
 		i.serviceMap[key] = svcInfo
 	}
 
+	if !isLegacy {
+		svcInfo.spec = serviceImport.Spec
+	}
+
 	svcInfo.isExported = true
 
 	if svcInfo.isHeadless() || !isLegacy {