implement cluster path resolution for cluster-names and cleanup unnecessary files and logic (#35)

Co-authored-by: Artem Shcherbatiuk <[email protected]>

Author: fourthisle

cmd/listen.go

@@ -10,6 +10,7 @@ import (
 	kcpapis "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 	kcpcore "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 	kcptenancy "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
+	"github.com/openmfp/crd-gql-gateway/listener/clusterpath"
 	"github.com/openmfp/crd-gql-gateway/listener/flags"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
@@ -155,7 +156,11 @@ var listenCmd = &cobra.Command{
 		}
 
 		reconciler := controller.NewAPIBindingReconciler(
-			ioHandler, df, apischema.NewResolver(),
+			ioHandler, df, apischema.NewResolver(), &clusterpath.Resolver{
+				Scheme:       mgr.GetScheme(),
+				Config:       cfg,
+				ResolverFunc: clusterpath.Resolve,
+			},
 		)
 
 		err = reconciler.SetupWithManager(mgr)

listener/apischema/testdata/artem_schema.json

@@ -0,0 +1,55 @@
+package clusterpath
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/url"
+
+	kcpcore "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+type Resolver struct {
+	*runtime.Scheme
+	*rest.Config
+	ResolverFunc
+}
+
+type ResolverFunc func(name string, cfg *rest.Config, scheme *runtime.Scheme) (string, error)
+
+func Resolve(name string, cfg *rest.Config, scheme *runtime.Scheme) (string, error) {
+	if name == "root" {
+		return name, nil
+	}
+	if cfg == nil {
+		return "", errors.New("config should not be nil")
+	}
+	if scheme == nil {
+		return "", errors.New("scheme should not be nil")
+	}
+	clusterCfg := rest.CopyConfig(cfg)
+	clusterCfgURL, err := url.Parse(clusterCfg.Host)
+	if err != nil {
+		return "", fmt.Errorf("failed to parse rest config Host URL: %w", err)
+	}
+	clusterCfgURL.Path = fmt.Sprintf("/clusters/%s", name)
+	clusterCfg.Host = clusterCfgURL.String()
+	clt, err := client.New(clusterCfg, client.Options{
+		Scheme: scheme,
+	})
+	if err != nil {
+		return "", fmt.Errorf("failed to create client for cluster: %w", err)
+	}
+	lc := &kcpcore.LogicalCluster{}
+	if err := clt.Get(context.TODO(), client.ObjectKey{Name: "cluster"}, lc); err != nil {
+		return "", fmt.Errorf("failed to get logicalcluster resource: %w", err)
+	}
+	path, ok := lc.GetAnnotations()["kcp.io/path"]
+	if !ok {
+		return "", errors.New("failed to get cluster path from kcp.io/path annotation")
+	}
+	return path, nil
+}

listener/apischema/testdata/kubeSchemaOut.json

@@ -9,14 +9,13 @@ import (
 	"io/fs"
 
 	"github.com/openmfp/crd-gql-gateway/listener/apischema"
+	"github.com/openmfp/crd-gql-gateway/listener/clusterpath"
 	"github.com/openmfp/crd-gql-gateway/listener/discoveryclient"
 	"github.com/openmfp/crd-gql-gateway/listener/workspacefile"
 
 	kcpapis "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
-	kcptenancy "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
@@ -25,47 +24,56 @@ type APIBindingReconciler struct {
 	io workspacefile.IOHandler
 	df discoveryclient.Factory
 	sc apischema.Resolver
+	pr *clusterpath.Resolver
 }
 
 func NewAPIBindingReconciler(
 	io workspacefile.IOHandler,
 	df discoveryclient.Factory,
 	sc apischema.Resolver,
+	pr *clusterpath.Resolver,
 ) *APIBindingReconciler {
 	return &APIBindingReconciler{
 		io: io,
 		df: df,
 		sc: sc,
+		pr: pr,
 	}
 }
 
 // +kubebuilder:rbac:groups=apis.kcp.io,resources=apibindings,verbs=get;list;watch
 // +kubebuilder:rbac:groups=apis.kcp.io,resources=apibindings/status,verbs=get
-// +kubebuilder:rbac:groups=tenancy.kcp.io,resources=workspaces,verbs=get;list;watch
-// +kubebuilder:rbac:groups=tenancy.kcp.io,resources=workspaces/status,verbs=get
 func (r *APIBindingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 
+	// ignore system workspaces (e.g. system:shard)
 	if strings.HasPrefix(req.ClusterName, "system") {
 		return ctrl.Result{}, nil
 	}
 
-	logger := log.FromContext(ctx).WithValues("cluster", req.ClusterName)
+	logger := log.FromContext(ctx)
+	clusterPath, err := r.pr.ResolverFunc(req.ClusterName, r.pr.Config, r.pr.Scheme)
+	if err != nil {
+		logger.Error(err, "failed to get cluster path", "cluster", req.ClusterName)
+		return ctrl.Result{}, err
+	}
+
+	logger = logger.WithValues("cluster", clusterPath)
 	logger.Info("starting reconciliation...")
 
-	dc, err := r.df.ClientForCluster(req.ClusterName)
+	dc, err := r.df.ClientForCluster(clusterPath)
 	if err != nil {
 		logger.Error(err, "failed to create discovery client for cluster")
 		return ctrl.Result{}, err
 	}
 
-	savedJSON, err := r.io.Read(req.ClusterName)
+	savedJSON, err := r.io.Read(clusterPath)
 	if errors.Is(err, fs.ErrNotExist) {
 		actualJSON, err1 := r.sc.Resolve(dc)
 		if err1 != nil {
 			logger.Error(err1, "failed to resolve server JSON schema")
 			return ctrl.Result{}, err1
 		}
-		if err = r.io.Write(actualJSON, req.ClusterName); err != nil {
+		if err := r.io.Write(actualJSON, clusterPath); err != nil {
 			logger.Error(err, "failed to write JSON to filesystem")
 			return ctrl.Result{}, err
 		}
@@ -83,8 +91,7 @@ func (r *APIBindingReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, err
 	}
 	if !bytes.Equal(actualJSON, savedJSON) {
-		err = r.io.Write(actualJSON, req.ClusterName)
-		if err != nil {
+		if err := r.io.Write(actualJSON, clusterPath); err != nil {
 			logger.Error(err, "failed to write JSON to filesystem")
 			return ctrl.Result{}, err
 		}
@@ -97,8 +104,6 @@ func (r *APIBindingReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 func (r *APIBindingReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&kcpapis.APIBinding{}).
-		Watches(&kcptenancy.Workspace{},
-			handler.EnqueueRequestsFromMapFunc(clusterNameFromWorkspace)).
 		Named("apibinding").
 		Complete(r)
 }

listener/apischema/testdata/v3JSON_v2_out.json

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	schemamocks "github.com/openmfp/crd-gql-gateway/listener/apischema/mocks"
+	"github.com/openmfp/crd-gql-gateway/listener/clusterpath"
 	"github.com/openmfp/crd-gql-gateway/listener/controller"
 	discoverymocks "github.com/openmfp/crd-gql-gateway/listener/discoveryclient/mocks"
 	iomocks "github.com/openmfp/crd-gql-gateway/listener/workspacefile/mocks"
@@ -267,5 +268,6 @@ func setupMocks(t *testing.T, tc testCase) *controller.APIBindingReconciler {
 		tc.schemaMocks(sc)
 	}
 
-	return controller.NewAPIBindingReconciler(ioHandler, df, sc)
+	//TODO: add fake impl for clusterpath resolver
+	return controller.NewAPIBindingReconciler(ioHandler, df, sc, &clusterpath.Resolver{})
 }