it's now compatible with kcp 0.28

On-behalf-of: @SAP [email protected]

Author: xrstf

Makefile

@@ -98,7 +98,7 @@ $(YQ):
 	  yq_*
 
 KCP = _tools/kcp
-KCP_VERSION = 0.27.1
+KCP_VERSION = 0.28.1
 
 .PHONY: $(KCP)
 $(KCP):

internal/controller/syncmanager/controller.go

@@ -18,7 +18,6 @@ package syncmanager
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"go.uber.org/zap"
@@ -74,7 +73,7 @@ type Reconciler struct {
 	stateNamespace  string
 	agentName       string
 
-	// only one of these two must be set
+	// endpointSlice is preferred over apiExport
 	apiExport     *kcpapisv1alpha1.APIExport
 	endpointSlice *kcpapisv1alpha1.APIExportEndpointSlice
 
@@ -105,8 +104,6 @@ type syncWorker struct {
 }
 
 // Add creates a new controller and adds it to the given manager.
-//
-// Only one of apiExport and endpointSlice must be given.
 func Add(
 	ctx context.Context,
 	localManager manager.Manager,
@@ -119,13 +116,6 @@ func Add(
 	stateNamespace string,
 	agentName string,
 ) error {
-	if apiExport != nil && endpointSlice != nil {
-		return errors.New("this controller works either with APIExport or APIExportEndpointSlice, not both")
-	}
-	if apiExport == nil && endpointSlice == nil {
-		return errors.New("neither APIExport nor APIExportEndpointSlice provided")
-	}
-
 	discoveryClient, err := discovery.NewClient(localManager.GetConfig())
 	if err != nil {
 		return fmt.Errorf("failed to create discovery client: %w", err)

test/utils/fixtures.go

@@ -129,18 +129,6 @@ func CreateAPIExport(t *testing.T, ctx context.Context, client ctrlruntimeclient
 		t.Fatalf("Failed to create APIExport: %v", err)
 	}
 
-	err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 30*time.Second, false, func(ctx context.Context) (done bool, err error) {
-		err = client.Get(ctx, ctrlruntimeclient.ObjectKeyFromObject(apiExport), apiExport)
-		if err != nil {
-			return false, err
-		}
-
-		return conditions.IsTrue(apiExport, kcpapisv1alpha1.APIExportVirtualWorkspaceURLsReady), nil
-	})
-	if err != nil {
-		t.Fatalf("Failed to wait for APIExport virtual workspace to become ready: %v", err)
-	}
-
 	// grant permissions to access/manage the APIExport
 	if rbacSubject != nil {
 		clusterRoleName := "api-syncagent"