Merge pull request #3696 from gman0/vr-endpointslice-getter-fix

VR apiserver retrieves endpoint slices by a get call

Author: kcp-ci-bot

pkg/server/config.go

@@ -696,6 +696,7 @@ func NewConfig(ctx context.Context, opts kcpserveroptions.CompletedOptions) (*Co
 			&virtualResourcesConfig,
 			vwClientConfig,
 			c.CacheDynamicClient,
+			c.Options.Extra.ShardName,
 			c.ShardVirtualWorkspaceURL,
 			c.ApiExtensionsSharedInformerFactory.Apiextensions().V1().CustomResourceDefinitions(),
 			c.KcpSharedInformerFactory.Apis().V1alpha2().APIBindings(),

pkg/server/virtualresources/config.go

@@ -37,6 +37,7 @@ type ExtraConfig struct {
 	VWClientConfig       *rest.Config
 	DynamicClusterClient kcpdynamic.ClusterInterface
 
+	ShardName                      string
 	ShardVirtualWorkspaceURLGetter func() string
 
 	CRDLister               kcpapiextensionsv1informers.CustomResourceDefinitionClusterInformer
@@ -84,6 +85,7 @@ func NewConfig(
 	cfg *genericapiserver.Config,
 	vwClientConfig *rest.Config,
 	dynamicClusterClient kcpdynamic.ClusterInterface,
+	shardName string,
 	shardVirtualWorkspaceURLGetter func() string,
 	crdLister kcpapiextensionsv1informers.CustomResourceDefinitionClusterInformer,
 	apiBindingInformer apisv1alpha2informers.APIBindingClusterInformer,
@@ -99,6 +101,7 @@ func NewConfig(
 			VWClientConfig:       vwClientConfig,
 			DynamicClusterClient: dynamicClusterClient,
 
+			ShardName:                      shardName,
 			ShardVirtualWorkspaceURLGetter: shardVirtualWorkspaceURLGetter,
 
 			CRDLister:               crdLister,

pkg/server/virtualresources/server.go

@@ -42,6 +42,8 @@ import (
 	"github.com/kcp-dev/logicalcluster/v3"
 	apisv1alpha2 "github.com/kcp-dev/sdk/apis/apis/v1alpha2"
 
+	cacheclient "github.com/kcp-dev/kcp/pkg/cache/client"
+	"github.com/kcp-dev/kcp/pkg/cache/client/shard"
 	"github.com/kcp-dev/kcp/pkg/endpointslice"
 	"github.com/kcp-dev/kcp/pkg/indexers"
 	"github.com/kcp-dev/kcp/pkg/reconciler/dynamicrestmapper"
@@ -66,7 +68,7 @@ type Server struct {
 	delegate         http.Handler
 
 	getCRD                       func(cluster logicalcluster.Name, name string) (*apiextensionsv1.CustomResourceDefinition, error)
-	getUnstructuredEndpointSlice func(ctx context.Context, cluster logicalcluster.Name, gvr schema.GroupVersionResource, name string) (*unstructured.Unstructured, error)
+	getUnstructuredEndpointSlice func(ctx context.Context, cluster logicalcluster.Name, shard shard.Name, gvr schema.GroupVersionResource, name string) (*unstructured.Unstructured, error)
 	getAPIExportByPath           func(clusterPath logicalcluster.Path, name string) (*apisv1alpha2.APIExport, error)
 }
 
@@ -76,27 +78,12 @@ func NewServer(c CompletedConfig, delegationTarget genericapiserver.DelegationTa
 		Extra:    c.Extra,
 		delegate: delegationTarget.UnprotectedHandler(),
 
-		getUnstructuredEndpointSlice: func(ctx context.Context, cluster logicalcluster.Name, gvr schema.GroupVersionResource, name string) (*unstructured.Unstructured, error) {
-			list, err := c.Extra.DynamicClusterClient.Cluster(cluster.Path()).Resource(gvr).List(ctx, metav1.ListOptions{})
-			if err != nil {
-				return nil, err
-			}
-
-			if len(list.Items) == 0 {
-				return nil, apierrors.NewNotFound(gvr.GroupResource(), name)
-			}
-
-			var slice *unstructured.Unstructured
-			for _, item := range list.Items {
-				if item.GetName() == name {
-					if slice != nil {
-						return nil, apierrors.NewInternalError(fmt.Errorf("multiple objects found"))
-					}
-					slice = &item
-				}
-			}
-
-			return slice, nil
+		getUnstructuredEndpointSlice: func(ctx context.Context, cluster logicalcluster.Name, shardName shard.Name, gvr schema.GroupVersionResource, name string) (*unstructured.Unstructured, error) {
+			// We assume the endpoint slice is cluster-scoped.
+			return c.Extra.DynamicClusterClient.
+				Cluster(cluster.Path()).
+				Resource(gvr).
+				Get(cacheclient.WithShardInContext(ctx, shardName), name, metav1.GetOptions{})
 		},
 		getCRD: func(clusterName logicalcluster.Name, name string) (*apiextensionsv1.CustomResourceDefinition, error) {
 			return c.Extra.CRDLister.Lister().Cluster(clusterName).Get(name)
@@ -283,7 +270,11 @@ func (s *Server) handleResource(w http.ResponseWriter, r *http.Request) {
 
 	// We have a virtual resource. Get the endpoint URL, create a proxy handler and serve from that endpoint.
 
-	vrEndpointURL, err := s.getVirtualResourceURL(ctx, logicalcluster.From(apiExport), virtualStorage)
+	apiExportShard := shard.Name(apiExport.Annotations[shard.AnnotationKey])
+	if apiExportShard.Empty() {
+		apiExportShard = shard.New(s.Extra.ShardName)
+	}
+	vrEndpointURL, err := s.getVirtualResourceURL(ctx, logicalcluster.From(apiExport), apiExportShard, virtualStorage)
 	if err != nil {
 		utilruntime.HandleError(err)
 		responsewriters.ErrorNegotiated(
@@ -306,7 +297,7 @@ func (s *Server) handleResource(w http.ResponseWriter, r *http.Request) {
 	vrHandler.ServeHTTP(w, r)
 }
 
-func (s *Server) getVirtualResourceURL(ctx context.Context, apiExportCluster logicalcluster.Name, virtual *apisv1alpha2.ResourceSchemaStorageVirtual) (string, error) {
+func (s *Server) getVirtualResourceURL(ctx context.Context, apiExportCluster logicalcluster.Name, apiExportShard shard.Name, virtual *apisv1alpha2.ResourceSchemaStorageVirtual) (string, error) {
 	sliceMapping, err := s.drm.ForCluster(apiExportCluster).RESTMapping(schema.GroupKind{
 		Group: ptr.Deref(virtual.Reference.APIGroup, ""),
 		Kind:  virtual.Reference.Kind,
@@ -315,7 +306,7 @@ func (s *Server) getVirtualResourceURL(ctx context.Context, apiExportCluster log
 		return "", err
 	}
 
-	slice, err := s.getUnstructuredEndpointSlice(ctx, apiExportCluster, schema.GroupVersionResource{
+	slice, err := s.getUnstructuredEndpointSlice(ctx, apiExportCluster, apiExportShard, schema.GroupVersionResource{
 		Group:    sliceMapping.Resource.Group,
 		Version:  sliceMapping.Resource.Version,
 		Resource: sliceMapping.Resource.Resource,