Update test & simplify logic

Author: mjudeikis

backend/controllers/clusterbinding/clusterbinding_controller.go

@@ -229,7 +229,10 @@ func mapAPIResourceSchema(clusterName string, cl cluster.Cluster) handler.TypedE
 		return []mcreconcile.Request{
 			{
 				Request: reconcile.Request{
-					NamespacedName: client.ObjectKeyFromObject(serviceExport),
+					NamespacedName: types.NamespacedName{
+						Namespace: serviceExport.GetNamespace(),
+						Name:      "cluster",
+					},
 				},
 				ClusterName: clusterName,
 			},

backend/controllers/servicenamespace/servicenamespace_reconcile.go

@@ -83,7 +83,7 @@ func (c *reconciler) reconcile(ctx context.Context, client client.Client, cache
 	}
 
 	for _, export := range apiServiceExports.Items {
-		name := fmt.Sprintf("kube-binder-%s-export-%s", sns.Name, export.Name) // per-sns unique name
+		name := fmt.Sprintf("kube-binder-export-%s-%s", sns.Name, export.Name) // per-sns unique name
 		permissions := []rbacv1.PolicyRule{}
 		for _, claim := range export.Spec.PermissionClaims {
 			permissions = append(permissions, rbacv1.PolicyRule{
@@ -106,7 +106,7 @@ func (c *reconciler) reconcile(ctx context.Context, client client.Client, cache
 					Rules: permissions,
 				}
 				// Create new ClusterRole
-				if err := client.Create(ctx, role); !errors.IsAlreadyExists(err) {
+				if err := client.Create(ctx, role); err != nil && !errors.IsAlreadyExists(err) {
 					return fmt.Errorf("failed to create ClusterRole %s: %w", name, err)
 				}
 			} else {

contrib/kcp/README.md

@@ -104,7 +104,7 @@ kubectl kcp bind apiexport root:provider:cowboys-stable
 ```bash
 kubectl get logicalcluster
 # NAME      PHASE   URL                                                    AGE
-# cluster   Ready   https://192.168.2.166:6443/clusters/1d5vpxvdpy0opbj1
+# cluster   Ready   https://192.168.2.166:6443/clusters/1f4roigyt6meiaf8 
 ```
 
 ## Consumer
@@ -120,7 +120,7 @@ kubectl ws create consumer --enter
 10. Bind the thing:
 
 ```bash
-./bin/kubectl-bind http://127.0.0.1:8080/clusters/1d5vpxvdpy0opbj1/exports --dry-run -o yaml > apiserviceexport.yaml
+./bin/kubectl-bind http://127.0.0.1:8080/clusters/1f4roigyt6meiaf8/exports --dry-run -o yaml > apiserviceexport.yaml
 
 # Extract secret for binding process. Note that secret name is not the same as output from command above. Check secret
 # name by running `kubectl get secret -n kube-bind`

pkg/konnector/controllers/cluster/serviceexport/spec/spec_controller.go

@@ -129,7 +129,12 @@ func NewController(
 			},
 			createProviderObject: func(ctx context.Context, obj *unstructured.Unstructured) (*unstructured.Unstructured, error) {
 				if ns := obj.GetNamespace(); ns != "" {
-					return providerClient.Resource(gvr).Namespace(obj.GetNamespace()).Create(ctx, obj, metav1.CreateOptions{})
+					copy := obj.DeepCopy()
+					err := clusterscoped.InjectClusterNs(copy, providerNamespace, providerNamespaceUID)
+					if err != nil {
+						return nil, err
+					}
+					return providerClient.Resource(gvr).Namespace(copy.GetNamespace()).Create(ctx, copy, metav1.CreateOptions{})
 				}
 				err := clusterscoped.TranslateFromDownstream(obj, providerNamespace, providerNamespaceUID)
 				if err != nil {