Decouple CRD and APIResourceSchema in service export request reconciler

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

On-behalf-of: @SAP karol.szwaj@sap.com

Author: cnvergence

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

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"time"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
 	apiextensionslisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -95,9 +94,6 @@ func NewController(
 		reconciler: reconciler{
 			informerScope:          scope,
 			clusterScopedIsolation: isolation,
-			getCRD: func(name string) (*apiextensionsv1.CustomResourceDefinition, error) {
-				return crdInformer.Lister().Get(name)
-			},
 			getAPIResourceSchema: func(ctx context.Context, name string) (*kubebindv1alpha2.APIResourceSchema, error) {
 				return apiResourceSchemaInformer.Lister().Get(name)
 			},
@@ -159,13 +155,13 @@ func NewController(
 
 	if _, err := crdInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: func(obj any) {
-			c.enqueueCRD(logger, obj)
+			c.enqueueAPIResourceSchema(logger, obj)
 		},
 		UpdateFunc: func(old, newObj any) {
-			c.enqueueCRD(logger, newObj)
+			c.enqueueAPIResourceSchema(logger, newObj)
 		},
 		DeleteFunc: func(obj any) {
-			c.enqueueCRD(logger, obj)
+			c.enqueueAPIResourceSchema(logger, obj)
 		},
 	}); err != nil {
 		return nil, err
@@ -235,14 +231,14 @@ func (c *Controller) enqueueServiceExport(logger klog.Logger, obj any) {
 	}
 }
 
-func (c *Controller) enqueueCRD(logger klog.Logger, obj any) {
-	crdKey, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
+func (c *Controller) enqueueAPIResourceSchema(logger klog.Logger, obj any) {
+	APIResourceSchemaKey, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj)
 	if err != nil {
 		runtime.HandleError(err)
 		return
 	}
 
-	requests, err := c.serviceExportRequestIndexer.ByIndex(indexers.ServiceExportRequestByGroupResource, crdKey)
+	requests, err := c.serviceExportRequestIndexer.ByIndex(indexers.ServiceExportRequestByGroupResource, APIResourceSchemaKey)
 	if err != nil {
 		runtime.HandleError(err)
 		return
@@ -253,7 +249,7 @@ func (c *Controller) enqueueCRD(logger klog.Logger, obj any) {
 			runtime.HandleError(err)
 			continue
 		}
-		logger.V(2).Info("queueing APIServiceExportRequest", "key", key, "reason", "CustomResourceDefinition", "CustomResourceDefinitionKey", crdKey)
+		logger.V(2).Info("queueing APIServiceExportRequest", "key", key, "reason", "APIResourceSchema", "APIResourceSchemaKey", APIResourceSchemaKey)
 		c.queue.Add(key)
 	}
 }

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

@@ -36,7 +36,6 @@ type reconciler struct {
 	informerScope          kubebindv1alpha2.InformerScope
 	clusterScopedIsolation kubebindv1alpha2.Isolation
 
-	getCRD                     func(name string) (*apiextensionsv1.CustomResourceDefinition, error)
 	getAPIResourceSchema       func(ctx context.Context, name string) (*kubebindv1alpha2.APIResourceSchema, error)
 	getServiceExport           func(ns, name string) (*kubebindv1alpha2.APIServiceExport, error)
 	createServiceExport        func(ctx context.Context, resource *kubebindv1alpha2.APIServiceExport) (*kubebindv1alpha2.APIServiceExport, error)
@@ -58,44 +57,22 @@ func (r *reconciler) reconcile(ctx context.Context, req *kubebindv1alpha2.APISer
 
 func (r *reconciler) ensureExports(ctx context.Context, req *kubebindv1alpha2.APIServiceExportRequest) error {
 	logger := klog.FromContext(ctx)
-
 	if req.Status.Phase == kubebindv1alpha2.APIServiceExportRequestPhasePending {
-		failure := false
 		for _, res := range req.Spec.Resources {
-			// backend is created using CRD's as backup. But this is not required.
 			name := res.Resource + "." + res.Group
-
 			apiResourceSchema, err := r.getAPIResourceSchema(ctx, name)
-			switch {
-			case apierrors.IsNotFound(err):
-				logger.V(1).Info("APIResourceSchema not found, continuing with fallback to CRD conversion to APIResourceSchema", "name", name)
-				crd, err := r.getCRD(name)
-				if err != nil && !apierrors.IsNotFound(err) {
-					return err
-				}
+			if err != nil {
 				if apierrors.IsNotFound(err) {
 					conditions.MarkFalse(
 						req,
 						kubebindv1alpha2.APIServiceExportRequestConditionExportsReady,
-						"CRDNotFound",
+						"APIResourceSchemaNotFound",
 						conditionsapi.ConditionSeverityError,
-						"CustomResourceDefinition %s in the service provider cluster not found",
+						"APIResourceSchema %s in the service provider cluster not found",
 						name,
 					)
-					failure = true
-					break
-				}
-				schema, err := helpers.CRDToAPIResourceSchema(crd, "")
-				if err != nil {
 					return err
 				}
-				schema.Namespace = req.Namespace
-
-				logger.V(1).Info("Creating APIResourceSchema", "name", schema.Name, "namespace", schema.Namespace)
-				if apiResourceSchema, err = r.createAPIResourceSchema(ctx, schema); err != nil {
-					return err
-				}
-			case err != nil:
 				return err
 			}
 
@@ -134,11 +111,8 @@ func (r *reconciler) ensureExports(ctx context.Context, req *kubebindv1alpha2.AP
 			}
 		}
 
-		if !failure {
-			conditions.MarkTrue(req, kubebindv1alpha2.APIServiceExportRequestConditionExportsReady)
-			req.Status.Phase = kubebindv1alpha2.APIServiceExportRequestPhaseSucceeded
-			return nil
-		}
+		conditions.MarkTrue(req, kubebindv1alpha2.APIServiceExportRequestConditionExportsReady)
+		req.Status.Phase = kubebindv1alpha2.APIServiceExportRequestPhaseSucceeded
 
 		if time.Since(req.CreationTimestamp.Time) > time.Minute {
 			req.Status.Phase = kubebindv1alpha2.APIServiceExportRequestPhaseFailed