Serve both v1alpha1 and v1alpha2 APIBindings in APIExport VW

Signed-off-by: Marko Mudrinić <[email protected]>
On-behalf-of: @SAP [email protected]

Author: xmudrii

pkg/virtual/apiexport/builder/build.go

@@ -179,7 +179,7 @@ func BuildVirtualWorkspace(
 						cancelFn:      cancelFn,
 					}, nil
 				},
-				func(ctx context.Context, clusterName logicalcluster.Name, apiExportName string) (apidefinition.APIDefinition, error) {
+				func(ctx context.Context, apibindingVersion string, clusterName logicalcluster.Name, apiExportName string) (apidefinition.APIDefinition, error) {
 					restProvider, err := provideAPIExportFilteredRestStorage(ctx, impersonatedDynamicClientGetter, clusterName, apiExportName)
 					if err != nil {
 						return nil, err
@@ -188,7 +188,7 @@ func BuildVirtualWorkspace(
 					return apiserver.CreateServingInfoFor(
 						mainConfig,
 						schemas.ApisKcpDevSchemas["apibindings"],
-						apisv1alpha1.SchemeGroupVersion.Version,
+						apibindingVersion,
 						restProvider,
 					)
 				},

pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_controller.go

@@ -62,7 +62,7 @@ func NewAPIReconciler(
 	apiResourceSchemaInformer apisv1alpha1informers.APIResourceSchemaClusterInformer,
 	apiExportInformer apisv1alpha2informers.APIExportClusterInformer,
 	createAPIDefinition CreateAPIDefinitionFunc,
-	createAPIBindingAPIDefinition func(ctx context.Context, clusterName logicalcluster.Name, apiExportName string) (apidefinition.APIDefinition, error),
+	createAPIBindingAPIDefinition func(ctx context.Context, apibindingVersion string, clusterName logicalcluster.Name, apiExportName string) (apidefinition.APIDefinition, error),
 ) (*APIReconciler, error) {
 	c := &APIReconciler{
 		kcpClusterClient: kcpClusterClient,
@@ -138,7 +138,7 @@ type APIReconciler struct {
 	queue workqueue.TypedRateLimitingInterface[string]
 
 	createAPIDefinition           CreateAPIDefinitionFunc
-	createAPIBindingAPIDefinition func(ctx context.Context, clusterName logicalcluster.Name, apiExportName string) (apidefinition.APIDefinition, error)
+	createAPIBindingAPIDefinition func(ctx context.Context, apibindingVersion string, clusterName logicalcluster.Name, apiExportName string) (apidefinition.APIDefinition, error)
 
 	mutex   sync.RWMutex // protects the map, not the values!
 	apiSets map[dynamiccontext.APIDomainKey]apidefinition.APIDefinitionSet

pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_reconcile.go

@@ -244,19 +244,20 @@ func (c *APIReconciler) reconcile(ctx context.Context, apiExport *apisv1alpha2.A
 
 	// always serve apibindings, either through a claim, or with this fallback
 	if !claimsAPIBindings {
-		d, err := c.createAPIBindingAPIDefinition(ctx, clusterName, apiExport.Name)
-		if err != nil {
-			// TODO(ncdc): would be nice to expose some sort of user-visible error
-			logger.Error(err, "error creating api definition for apibindings")
-		}
+		for _, gvr := range []schema.GroupVersionResource{apisv1alpha1.SchemeGroupVersion.WithResource("apibindings"), apisv1alpha2.SchemeGroupVersion.WithResource("apibindings")} {
+			d, err := c.createAPIBindingAPIDefinition(ctx, gvr.Version, clusterName, apiExport.Name)
+			if err != nil {
+				// TODO(ncdc): would be nice to expose some sort of user-visible error
+				logger.Error(err, "error creating api definition for apibindings")
+			}
 
-		gvr := apisv1alpha2.SchemeGroupVersion.WithResource("apibindings")
-		newSet[gvr] = apiResourceSchemaApiDefinition{
-			APIDefinition: d,
-		}
-		newGVRs = append(newGVRs, gvrString(gvr))
-		if _, ok := oldSet[gvr]; ok {
-			preservedGVR = append(preservedGVR, gvrString(gvr))
+			newSet[gvr] = apiResourceSchemaApiDefinition{
+				APIDefinition: d,
+			}
+			newGVRs = append(newGVRs, gvrString(gvr))
+			if _, ok := oldSet[gvr]; ok {
+				preservedGVR = append(preservedGVR, gvrString(gvr))
+			}
 		}
 	}
 

test/e2e/virtual/apiexport/virtualworkspace_test.go

@@ -133,6 +133,10 @@ func TestAPIExportVirtualWorkspace(t *testing.T) {
 	require.NoError(t, err, "error retrieving APIExport discovery")
 	require.True(t, resourceExists(resources, "apibindings"), "missing apibindings")
 
+	resources, err = discoveryVCClusterClient.ServerResourcesForGroupVersion(apisv1alpha1.SchemeGroupVersion.String())
+	require.NoError(t, err, "error retrieving APIExport discovery")
+	require.True(t, resourceExists(resources, "apibindings"), "missing apibindings")
+
 	user1VWCfg := framework.StaticTokenUserConfig("user-1", apiExportVWCfg)
 	wwUser1VC, err := wildwestclientset.NewForConfig(user1VWCfg)
 	require.NoError(t, err)