Change PutEndpointSlice signature to PutEndpointSlices

...to handle multiple headless EndpointSlices. Signed-off-by: Tom Pantelis <[email protected]>
submariner-io · Jul 26, 2023 · 8a4369f · 8a4369f
1 parent 576e572
commit 8a4369f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 21 deletions.
diff --git a/coredns/plugin/handler_test.go b/coredns/plugin/handler_test.go
@@ -100,7 +100,7 @@ func testWithoutFallback() {
 
 		t.lh.Resolver.PutServiceImport(newServiceImport(namespace1, service1, mcsv1a1.ClusterSetIP))
 
-		t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
+		t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
 			newEndpoint(serviceIP, "", true)))
 
 		rec = dnstest.NewRecorder(&test.ResponseWriter{})
@@ -164,7 +164,7 @@ func testWithoutFallback() {
 		BeforeEach(func() {
 			t.lh.Resolver.PutServiceImport(newServiceImport(namespace2, service1, mcsv1a1.ClusterSetIP))
 
-			t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace2, service1, clusterID, []mcsv1a1.ServicePort{port1},
+			t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace2, service1, clusterID, []mcsv1a1.ServicePort{port1},
 				newEndpoint(serviceIP, "", true)))
 		})
 
@@ -322,7 +322,7 @@ func testWithFallback() {
 
 		t.lh.Resolver.PutServiceImport(newServiceImport(namespace1, service1, mcsv1a1.ClusterSetIP))
 
-		t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
+		t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
 			newEndpoint(serviceIP, "", true)))
 
 		rec = dnstest.NewRecorder(&test.ResponseWriter{})
@@ -443,10 +443,10 @@ func testClusterStatus() {
 
 		t.lh.Resolver.PutServiceImport(newServiceImport(namespace1, service1, mcsv1a1.ClusterSetIP))
 
-		t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
+		t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
 			newEndpoint(serviceIP, "", true)))
 
-		t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID2, []mcsv1a1.ServicePort{port1, port2},
+		t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID2, []mcsv1a1.ServicePort{port1, port2},
 			newEndpoint(serviceIP2, "", true)))
 
 		rec = dnstest.NewRecorder(&test.ResponseWriter{})
@@ -584,7 +584,7 @@ func testHeadlessService() {
 	})
 
 	JustBeforeEach(func() {
-		t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1}, endpoints...))
+		t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1}, endpoints...))
 	})
 
 	When("a headless service has no endpoints", func() {
@@ -720,7 +720,7 @@ func testHeadlessService() {
 		BeforeEach(func() {
 			t.lh.Resolver.PutServiceImport(newServiceImport(namespace1, service1, mcsv1a1.Headless))
 
-			t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID2, []mcsv1a1.ServicePort{port1},
+			t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID2, []mcsv1a1.ServicePort{port1},
 				newEndpoint(endpointIP2, hostName2, true)))
 
 			endpoints = append(endpoints, newEndpoint(endpointIP, hostName1, true))
@@ -774,12 +774,12 @@ func testLocalService() {
 
 		t.lh.Resolver.PutServiceImport(newServiceImport(namespace1, service1, mcsv1a1.ClusterSetIP))
 
-		t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
+		t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
 			newEndpoint(serviceIP, "", true)))
 
 		t.lh.Resolver.PutServiceImport(newServiceImport(namespace1, service1, mcsv1a1.ClusterSetIP))
 
-		t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID2, []mcsv1a1.ServicePort{port1, port2},
+		t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID2, []mcsv1a1.ServicePort{port1, port2},
 			newEndpoint(serviceIP2, "", true)))
 
 		rec = dnstest.NewRecorder(&test.ResponseWriter{})
@@ -853,7 +853,7 @@ func testLocalService() {
 
 	When("service is in local and remote clusters and local has no active endpoints", func() {
 		BeforeEach(func() {
-			t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
+			t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1},
 				newEndpoint(serviceIP, "", false)))
 		})
 
@@ -884,7 +884,7 @@ func testSRVMultiplePorts() {
 
 		t.lh.Resolver.PutServiceImport(newServiceImport(namespace1, service1, mcsv1a1.ClusterSetIP))
 
-		t.lh.Resolver.PutEndpointSlice(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1, port2},
+		t.lh.Resolver.PutEndpointSlices(newEndpointSlice(namespace1, service1, clusterID, []mcsv1a1.ServicePort{port1, port2},
 			newEndpoint(endpointIP, "", true)))
 
 		rec = dnstest.NewRecorder(&test.ResponseWriter{})

diff --git a/coredns/resolver/clusterip_service_test.go b/coredns/resolver/clusterip_service_test.go
@@ -372,7 +372,7 @@ func testClusterIPServiceMisc() {
 	When("a cluster's EndpointSlice is initially created before the ServiceImport", func() {
 		It("should eventually process them and return its DNS record", func() {
 			es := newClusterIPEndpointSlice(namespace1, service1, clusterID1, serviceIP1, true)
-			Expect(t.resolver.PutEndpointSlice(es)).To(BeTrue())
+			Expect(t.resolver.PutEndpointSlices(es)).To(BeTrue())
 
 			t.awaitDNSRecords(namespace1, service1, clusterID1, "", false)
 
@@ -412,7 +412,7 @@ func testClusterIPServiceMisc() {
 
 			t.resolver.PutServiceImport(serviceImport)
 
-			Expect(t.resolver.PutEndpointSlice(newClusterIPEndpointSlice(namespace1, service1, clusterID1, serviceIP1, true))).To(BeTrue())
+			Expect(t.resolver.PutEndpointSlices(newClusterIPEndpointSlice(namespace1, service1, clusterID1, serviceIP1, true))).To(BeTrue())
 
 			t.resolver.RemoveServiceImport(serviceImport)
 		})
@@ -435,7 +435,7 @@ func testClusterIPServiceMisc() {
 
 			t.resolver.PutServiceImport(serviceImport)
 
-			Expect(t.resolver.PutEndpointSlice(newClusterIPEndpointSlice(namespace1, service1, clusterID1, serviceIP1, true))).To(BeTrue())
+			Expect(t.resolver.PutEndpointSlices(newClusterIPEndpointSlice(namespace1, service1, clusterID1, serviceIP1, true))).To(BeTrue())
 
 			t.resolver.RemoveServiceImport(serviceImport)
 		})

diff --git a/coredns/resolver/controller.go b/coredns/resolver/controller.go
@@ -92,7 +92,7 @@ func (c *controller) Stop() {
 }
 
 func (c *controller) onEndpointSliceCreateOrUpdate(obj runtime.Object, _ int) bool {
-	return c.resolver.PutEndpointSlice(obj.(*discovery.EndpointSlice))
+	return c.resolver.PutEndpointSlices(obj.(*discovery.EndpointSlice))
 }
 
 func (c *controller) onEndpointSliceDelete(obj runtime.Object, _ int) bool {

diff --git a/coredns/resolver/endpoint_slice.go b/coredns/resolver/endpoint_slice.go
@@ -38,7 +38,9 @@ import (
 
 const maxRecordsToLog = 5
 
-func (i *Interface) PutEndpointSlice(endpointSlice *discovery.EndpointSlice) bool {
+func (i *Interface) PutEndpointSlices(endpointSlices ...*discovery.EndpointSlice) bool {
+	endpointSlice := endpointSlices[0]
+
 	key, clusterID, ok := getKeyInfoFrom(endpointSlice)
 	if !ok {
 		return false

diff --git a/coredns/resolver/endpoint_slice_test.go b/coredns/resolver/endpoint_slice_test.go
@@ -27,7 +27,7 @@ import (
 	mcsv1a1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
 )
 
-var _ = Describe("PutEndpointSlice", func() {
+var _ = Describe("PutEndpointSlices", func() {
 	t := newTestDriver()
 
 	When("the EndpointSlice is missing the required labels", func() {

diff --git a/coredns/resolver/headless_service_test.go b/coredns/resolver/headless_service_test.go
@@ -169,11 +169,11 @@ func testHeadlessService() {
 					constants.PublishNotReadyAddresses: strconv.FormatBool(true),
 				}
 
-				// If the local cluster EndpointSlice is created before the local K8s EndpointSlice, PutEndpointSlice should
+				// If the local cluster EndpointSlice is created before the local K8s EndpointSlice, PutEndpointSlices should
 				// return true to requeue.
 				eps := newEndpointSlice(namespace1, service1, clusterID1, nil)
 				eps.Annotations = annotations
-				Expect(t.resolver.PutEndpointSlice(eps)).To(BeTrue())
+				Expect(t.resolver.PutEndpointSlices(eps)).To(BeTrue())
 
 				eps1 := &discovery.EndpointSlice{
 					ObjectMeta: metav1.ObjectMeta{

diff --git a/coredns/resolver/resolver_suite_test.go b/coredns/resolver/resolver_suite_test.go
@@ -254,7 +254,7 @@ func (t *testDriver) testRoundRobin(ns, service string, serviceIPs ...string) {
 }
 
 func (t *testDriver) putEndpointSlice(es *discovery.EndpointSlice) {
-	Expect(t.resolver.PutEndpointSlice(es)).To(BeFalse())
+	Expect(t.resolver.PutEndpointSlices(es)).To(BeFalse())
 }
 
 func newAggregatedServiceImport(namespace, name string) *mcsv1a1.ServiceImport {

diff --git a/coredns/resolver/service_import_migration_test.go b/coredns/resolver/service_import_migration_test.go
@@ -59,7 +59,7 @@ var _ = Describe("ServiceImport migration", func() {
 		}}
 
 		delete(legacyEndpointSlice.Labels, constants.LabelIsHeadless)
-		t.resolver.PutEndpointSlice(legacyEndpointSlice)
+		t.resolver.PutEndpointSlices(legacyEndpointSlice)
 	})
 
 	When("a legacy per-cluster ServiceImport and EndpointSlice are created", func() {