Minor fixes

Azure · Aug 31, 2023 · 3cd8b62 · 3cd8b62
1 parent 581c690
commit 3cd8b62
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/pkg/controllers/hub/endpointsliceexport/controller.go b/pkg/controllers/hub/endpointsliceexport/controller.go
@@ -38,6 +38,24 @@ const (
 	endpointSliceExportRetryInterval = time.Second * 5
 )
 
+var (
+	endpointSliceImportIndexerFunc = func(o client.Object) []string {
+		endpointSliceImport, ok := o.(*fleetnetv1alpha1.EndpointSliceImport)
+		if !ok {
+			return []string{}
+		}
+		return []string{endpointSliceImport.ObjectMeta.Name}
+	}
+
+	endpointSliceExportIndexerFunc = func(o client.Object) []string {
+		endpointSliceExport, ok := o.(*fleetnetv1alpha1.EndpointSliceExport)
+		if !ok {
+			return []string{}
+		}
+		return []string{endpointSliceExport.Spec.OwnerServiceReference.NamespacedName}
+	}
+)
+
 // Reconciler reconciles the distribution of EndpointSlices across the fleet.
 type Reconciler struct {
 	HubClient client.Client
@@ -231,13 +249,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 // SetupWithManager sets up the EndpointSliceExport controller with a controller manager.
 func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
 	// Set up an index for efficient EndpointSliceImport lookup.
-	endpointSliceImportIndexerFunc := func(o client.Object) []string {
-		endpointSliceImport, ok := o.(*fleetnetv1alpha1.EndpointSliceImport)
-		if !ok {
-			return []string{}
-		}
-		return []string{endpointSliceImport.ObjectMeta.Name}
-	}
 	if err := mgr.GetFieldIndexer().IndexField(ctx,
 		&fleetnetv1alpha1.EndpointSliceImport{},
 		endpointSliceImportNameFieldKey,
@@ -248,13 +259,6 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 	}
 
 	// Set up an index for efficient EndpointSliceExport lookup.
-	endpointSliceExportIndexerFunc := func(o client.Object) []string {
-		endpointSliceExport, ok := o.(*fleetnetv1alpha1.EndpointSliceExport)
-		if !ok {
-			return []string{}
-		}
-		return []string{endpointSliceExport.Spec.OwnerServiceReference.NamespacedName}
-	}
 	if err := mgr.GetFieldIndexer().IndexField(ctx,
 		&fleetnetv1alpha1.EndpointSliceExport{},
 		endpointSliceExportOwnerSvcNamespacedNameFieldKey,

diff --git a/pkg/controllers/hub/endpointsliceexport/controller_test.go b/pkg/controllers/hub/endpointsliceexport/controller_test.go
@@ -157,6 +157,9 @@ func TestWithdrawAllEndpointSliceImports(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			fakeHubClientBuilder := fake.NewClientBuilder().
 				WithScheme(scheme.Scheme).
+				// Set up indexes on the fake client.
+				WithIndex(&fleetnetv1alpha1.EndpointSliceExport{}, endpointSliceExportOwnerSvcNamespacedNameFieldKey, endpointSliceExportIndexerFunc).
+				WithIndex(&fleetnetv1alpha1.EndpointSliceImport{}, endpointSliceImportNameFieldKey, endpointSliceImportIndexerFunc).
 				WithObjects(tc.endpointSliceExport)
 			for idx := range tc.endpointSliceImports {
 				fakeHubClientBuilder = fakeHubClientBuilder.WithObjects(tc.endpointSliceImports[idx])
@@ -408,6 +411,8 @@ func TestScanForEndpointSliceImports(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			fakeHubClientBuilder := fake.NewClientBuilder().
 				WithScheme(scheme.Scheme).
+				WithIndex(&fleetnetv1alpha1.EndpointSliceExport{}, endpointSliceExportOwnerSvcNamespacedNameFieldKey, endpointSliceExportIndexerFunc).
+				WithIndex(&fleetnetv1alpha1.EndpointSliceImport{}, endpointSliceImportNameFieldKey, endpointSliceImportIndexerFunc).
 				WithObjects(tc.endpointSliceExport)
 			for idx := range tc.endpointSliceImports {
 				fakeHubClientBuilder = fakeHubClientBuilder.WithObjects(tc.endpointSliceImports[idx])