modify crd indexers

Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>

Author: cnvergence

contrib/example-backend/controllers/serviceexport/serviceexport_controller.go

@@ -67,10 +67,10 @@ func NewAPIServiceExportReconciler(
 		return nil, err
 	}
 
-	// Set up field indexer for APIServiceExports by CustomResourceDefinition name.
-	if err := cache.IndexField(ctx, &kubebindv1alpha2.APIServiceExport{}, indexers.ServiceExportByCustomResourceDefinition,
-		indexers.IndexServiceExportByCustomResourceDefinitionControllerRuntime); err != nil {
-		return nil, fmt.Errorf("failed to setup ServiceExportByCustomResourceDefinition indexer: %w", err)
+	// Set up field indexer for APIServiceExports by APIResourceSchema name.
+	if err := cache.IndexField(ctx, &kubebindv1alpha2.APIServiceExport{}, indexers.ServiceExportByAPIResourceSchema,
+		indexers.IndexServiceExportByAPIResourceSchema); err != nil {
+		return nil, fmt.Errorf("failed to setup ServiceExportByAPIResourceSchema indexer: %w", err)
 	}
 
 	r := &APIServiceExportReconciler{

contrib/example-backend/controllers/serviceexportrequest/serviceexportrequest_controller.go

@@ -79,12 +79,12 @@ func NewAPIServiceExportRequestReconciler(
 
 	// Set up field indexers for APIServiceExportRequests
 	if err := cache.IndexField(ctx, &kubebindv1alpha2.APIServiceExportRequest{}, indexers.ServiceExportRequestByServiceExport,
-		indexers.IndexServiceExportRequestByServiceExportControllerRuntime); err != nil {
+		indexers.IndexServiceExportRequestByServiceExport); err != nil {
 		return nil, fmt.Errorf("failed to setup ServiceExportRequestByServiceExport indexer: %w", err)
 	}
 
 	if err := cache.IndexField(ctx, &kubebindv1alpha2.APIServiceExportRequest{}, indexers.ServiceExportRequestByGroupResource,
-		indexers.IndexServiceExportRequestByGroupResourceControllerRuntime); err != nil {
+		indexers.IndexServiceExportRequestByGroupResource); err != nil {
 		return nil, fmt.Errorf("failed to setup ServiceExportRequestByGroupResource indexer: %w", err)
 	}
 

pkg/indexers/serviceexport.go

@@ -36,9 +36,8 @@ func IndexServiceExportByCustomResourceDefinition(obj any) ([]string, error) {
 	return []string{export.Name}, nil
 }
 
-// IndexServiceExportByCustomResourceDefinitionControllerRuntime is a controller-runtime compatible indexer function
-// that indexes APIServiceExports by their CustomResourceDefinition name.
-func IndexServiceExportByCustomResourceDefinitionControllerRuntime(obj client.Object) []string {
+// IndexServiceExportByAPIResourceSchema is a controller-runtime compatible indexer function.
+func IndexServiceExportByAPIResourceSchema(obj client.Object) []string {
 	export, ok := obj.(*v1alpha2.APIServiceExport)
 	if !ok {
 		return nil
@@ -51,11 +50,3 @@ func IndexServiceExportByCustomResourceDefinitionControllerRuntime(obj client.Ob
 
 	return names
 }
-func IndexServiceExportByAPIResourceSchema(obj any) ([]string, error) {
-	export, ok := obj.(*v1alpha2.APIServiceExport)
-	if !ok {
-		return nil, nil
-	}
-
-	return []string{export.Name}, nil
-}

pkg/indexers/serviceexportrequest.go

@@ -27,21 +27,9 @@ const (
 	ServiceExportRequestByServiceExport = "ServiceExportRequestByServiceExport"
 )
 
-func IndexServiceExportRequestByGroupResource(obj any) ([]string, error) {
-	apiServiceExportRequest, ok := obj.(*kubebindv1alpha2.APIServiceExportRequest)
-	if !ok {
-		return nil, nil
-	}
-	keys := []string{}
-	for _, gr := range apiServiceExportRequest.Spec.Resources {
-		keys = append(keys, gr.Resource+"."+gr.Group)
-	}
-	return keys, nil
-}
-
-// IndexServiceExportRequestByGroupResourceControllerRuntime is a controller-runtime compatible indexer function
+// IndexServiceExportRequestByGroupResource is a controller-runtime compatible indexer function
 // that indexes APIServiceExportRequests by their Group.Resource name.
-func IndexServiceExportRequestByGroupResourceControllerRuntime(obj client.Object) []string {
+func IndexServiceExportRequestByGroupResource(obj client.Object) []string {
 	apiServiceExportRequest, ok := obj.(*kubebindv1alpha2.APIServiceExportRequest)
 	if !ok {
 		return nil
@@ -53,21 +41,9 @@ func IndexServiceExportRequestByGroupResourceControllerRuntime(obj client.Object
 	return keys
 }
 
-func IndexServiceExportRequestByServiceExport(obj any) ([]string, error) {
-	apiServiceExportRequest, ok := obj.(*kubebindv1alpha2.APIServiceExportRequest)
-	if !ok {
-		return nil, nil
-	}
-	keys := []string{}
-	for _, gr := range apiServiceExportRequest.Spec.Resources {
-		keys = append(keys, apiServiceExportRequest.Namespace+"/"+gr.Resource+"."+gr.Group)
-	}
-	return keys, nil
-}
-
-// IndexServiceExportRequestByServiceExportControllerRuntime is a controller-runtime compatible indexer function
+// IndexServiceExportRequestByServiceExport is a controller-runtime compatible indexer function
 // that indexes APIServiceExportRequests by their related ServiceExport name.
-func IndexServiceExportRequestByServiceExportControllerRuntime(obj client.Object) []string {
+func IndexServiceExportRequestByServiceExport(obj client.Object) []string {
 	apiServiceExportRequest, ok := obj.(*kubebindv1alpha2.APIServiceExportRequest)
 	if !ok {
 		return nil