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_reconcile.go

@@ -58,22 +58,18 @@ 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) {
+				apiResourceSchema, err = r.ensureAPIResourceSchema(ctx, req, name)
+				if err != nil {
 					return err
 				}
-				if apierrors.IsNotFound(err) {
+				if apiResourceSchema == nil {
 					conditions.MarkFalse(
 						req,
 						kubebindv1alpha2.APIServiceExportRequestConditionExportsReady,
@@ -83,17 +79,7 @@ func (r *reconciler) ensureExports(ctx context.Context, req *kubebindv1alpha2.AP
 						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
+					continue
 				}
 			case err != nil:
 				return err
@@ -155,3 +141,39 @@ func (r *reconciler) ensureExports(ctx context.Context, req *kubebindv1alpha2.AP
 
 	return nil
 }
+
+func (r *reconciler) ensureAPIResourceSchema(
+	ctx context.Context,
+	req *kubebindv1alpha2.APIServiceExportRequest,
+	name string,
+) (*kubebindv1alpha2.APIResourceSchema, error) {
+	logger := klog.FromContext(ctx)
+
+	// try to get existing APIResourceSchema first
+	apiResourceSchema, err := r.getAPIResourceSchema(ctx, name)
+	if err == nil {
+		logger.V(1).Info("Found existing APIResourceSchema", "name", name)
+		return apiResourceSchema, nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	// fallback to CRD conversion
+	crd, err := r.getCRD(name)
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil, nil // Neither APIResourceSchema nor CRD found
+		}
+		return nil, err
+	}
+
+	logger.V(1).Info("Creating APIResourceSchema from CRD conversion", "name", name)
+	schema, err := helpers.CRDToAPIResourceSchema(crd, "")
+	if err != nil {
+		return nil, err
+	}
+	schema.Namespace = req.Namespace
+
+	return r.createAPIResourceSchema(ctx, schema)
+}