fixes

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

Author: xrstf

cmd/api-syncagent/kcp.go

@@ -22,9 +22,10 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/kcp-dev/api-syncagent/internal/kcp"
 	"github.com/kcp-dev/logicalcluster/v3"
 
+	"github.com/kcp-dev/api-syncagent/internal/kcp"
+
 	kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 	kcpdevcore "github.com/kcp-dev/kcp/sdk/apis/core"
 	kcpdevcorev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
@@ -53,7 +54,7 @@ import (
 // either the APIExport or the APIExportEndpointSlice.
 func setupEndpointKcpCluster(endpoint *syncEndpoint) (cluster.Cluster, error) {
 	// no need for a dedicated endpoint cluster
-	if endpoint.APIExport.Cluster == endpoint.EndpointSlice.Cluster {
+	if endpoint.EndpointSlice == nil || endpoint.EndpointSlice.Cluster == endpoint.APIExport.Cluster {
 		return nil, nil
 	}
 

cmd/api-syncagent/main.go

@@ -36,6 +36,8 @@ import (
 	"github.com/kcp-dev/api-syncagent/internal/version"
 	syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"
 
+	kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
+
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -177,10 +179,15 @@ func run(ctx context.Context, log *zap.SugaredLogger, opts *Options) error {
 			cluster = managedKcpCluster
 		}
 
+		var endpointSlice *kcpdevv1alpha1.APIExportEndpointSlice
+		if endpoint.EndpointSlice != nil {
+			endpointSlice = endpoint.EndpointSlice.APIExportEndpointSlice
+		}
+
 		// It doesn't matter which rest config we specify, as the URL will be overwritten with the
 		// virtual workspace URL anyway.
 
-		return syncmanager.Add(ctx, mgr, cluster, kcpRestConfig, log, endpoint.APIExport.APIExport, endpoint.EndpointSlice.APIExportEndpointSlice, opts.PublishedResourceSelector, opts.Namespace, opts.AgentName)
+		return syncmanager.Add(ctx, mgr, cluster, kcpRestConfig, log, endpoint.APIExport.APIExport, endpointSlice, opts.PublishedResourceSelector, opts.Namespace, opts.AgentName)
 	}); err != nil {
 		return err
 	}

test/utils/fixtures.go

@@ -160,6 +160,11 @@ func CreateAPIExport(t *testing.T, ctx context.Context, client ctrlruntimeclient
 					Resources: []string{"events"},
 					Verbs:     []string{"get", "create", "update", "patch"},
 				},
+				{
+					APIGroups: []string{"apis.kcp.io"},
+					Resources: []string{"apiexportendpointslices"},
+					Verbs:     []string{"get", "list", "watch"},
+				},
 				{
 					APIGroups: []string{"apis.kcp.io"},
 					Resources: []string{"apiresourceschemas"},