address reviews

Author: mjudeikis

backend/provider/kcp/controllers/apibindingtemplate/reconcile.go

@@ -37,7 +37,14 @@ import (
 )
 
 // templateNameForBinding derives a deterministic APIServiceExportTemplate name
-// from the APIBinding name and scope.
+// from the APIBinding name and scope. The naming convention is:
+//
+//	<bindingName>-cluster     for ClusterScope
+//	<bindingName>-namespaced  for NamespacedScope
+//
+// Note: if a binding name already ends in "-cluster" or "-namespaced", this
+// could theoretically collide with another binding's template name. In practice
+// kcp APIBinding names are generated and unlikely to hit this edge case.
 func templateNameForBinding(bindingName string, scope kubebindv1alpha2.InformerScope) string {
 	switch scope {
 	case kubebindv1alpha2.ClusterScope:

backend/provider/kcp/controllers/shared/vw.go

@@ -37,8 +37,12 @@ import (
 const AnnotationOwnerBinding = "apibindingtemplate.kube-bind.io/owner-binding"
 
 // ExtractClusterID extracts the cluster ID from an apiexport virtual workspace
-// URL. The URL format is:
-// https://host:port/services/apiexport/root:org:ws/<apiexport-name>/clusters/{cluster-id}
+// URL. The expected URL format (as of kcp v0.26+) is:
+//
+//	https://host:port/services/apiexport/<path>/<apiexport-name>/clusters/<cluster-id>
+//
+// where path segments 0-3 are /services/apiexport/<workspace-path>/<export>,
+// segment 4 is "clusters", and segment 5 is the cluster ID.
 func ExtractClusterID(clusterConfig *rest.Config) (string, error) {
 	u, err := url.Parse(clusterConfig.Host)
 	if err != nil {

contrib/kcp/README.md

@@ -57,7 +57,6 @@ The provider workspace owns the `cowboys` `APIResourceSchema` and `APIExport`.
 
 2. Set up the provider workspace:
 
-cp ../../kcp-dev/kcp/.kcp/admin.kubeconfig .kcp/admin.kubeconfig
 
 ```bash
 cp .kcp/admin.kubeconfig .kcp/provider.kubeconfig