adjust binding

Author: mjudeikis

cli/pkg/kubectl/base/options.go

@@ -172,6 +172,9 @@ func (o *Options) Complete(skipValidate bool) error {
 		// This should never happen. This is programming error.
 		return fmt.Errorf("failed to resolve server configuration")
 	}
+
+	o.Server = s.URL
+	o.Cluster = s.Cluster
 	o.server = s
 	o.config = c
 

cli/pkg/kubectl/bind-apiservice/plugin/bind.go

@@ -36,7 +36,6 @@ import (
 	"k8s.io/component-base/logs"
 	logsv1 "k8s.io/component-base/logs/api/v1"
 
-	"github.com/kube-bind/kube-bind/cli/pkg/client"
 	"github.com/kube-bind/kube-bind/cli/pkg/kubectl/base"
 	kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2"
 )
@@ -64,6 +63,7 @@ type BindAPIServiceOptions struct {
 	NoBanner               bool
 	DryRun                 bool
 	Template               string
+	Name                   string
 }
 
 // NewBindAPIServiceOptions returns new BindAPIServiceOptions.
@@ -98,6 +98,9 @@ func (b *BindAPIServiceOptions) AddCmdFlags(cmd *cobra.Command) {
 
 // Complete ensures all fields are initialized.
 func (b *BindAPIServiceOptions) Complete(args []string) error {
+	if len(args) > 0 {
+		b.Name = args[0]
+	}
 	if err := b.Options.Complete(false); err != nil {
 		return err
 	}
@@ -130,6 +133,9 @@ func (b *BindAPIServiceOptions) Validate() error {
 			return errors.New("remote-kubeconfig or remote-kubeconfig-namespace and remote-kubeconfig-name are required")
 		}
 	}
+	if b.Name == "" {
+		return errors.New("name is required")
+	}
 
 	return b.Options.Validate()
 }
@@ -271,9 +277,18 @@ func (b *BindAPIServiceOptions) bindTemplate(ctx context.Context) (*bindTemplate
 		return nil, fmt.Errorf("failed to create authenticated client: %w", err)
 	}
 
-	bindResponse, err := getBindResponse(ctx, client, b.Template)
+	bindRequest := &kubebindv1alpha2.BindableResourcesRequest{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: b.Name,
+		},
+		TemplateRef: kubebindv1alpha2.APIServiceExportTemplateRef{
+			Name: b.Template,
+		},
+	}
+
+	bindResponse, err := client.Bind(ctx, bindRequest)
 	if err != nil {
-		return nil, fmt.Errorf("failed to bind template: %w", err)
+		return nil, fmt.Errorf("failed to bind to template %q: %w", b.Template, err)
 	}
 
 	if bindResponse.Authentication.OAuth2CodeGrant == nil {
@@ -299,7 +314,7 @@ func (b *BindAPIServiceOptions) bindTemplate(ctx context.Context) (*bindTemplate
 		return nil, err
 	}
 	if created {
-		fmt.Fprintf(b.Options.IOStreams.ErrOut, "reated secret %s/%s for host %s, namespace %s\n", "kube-bind", secret.Name, remoteHost, remoteNamespace)
+		fmt.Fprintf(b.Options.IOStreams.ErrOut, "Created secret %s/%s for host %s, namespace %s\n", "kube-bind", secret.Name, remoteHost, remoteNamespace)
 	} else {
 		fmt.Fprintf(b.Options.IOStreams.ErrOut, "Updated secret %s/%s for host %s, namespace %s\n", "kube-bind", secret.Name, remoteHost, remoteNamespace)
 	}
@@ -309,17 +324,3 @@ func (b *BindAPIServiceOptions) bindTemplate(ctx context.Context) (*bindTemplate
 		name:      secret.Name,
 	}, nil
 }
-
-// getBindResponse retrieves the binding response for a template.
-func getBindResponse(ctx context.Context, client client.Client, templateName string) (*kubebindv1alpha2.BindingResourceResponse, error) {
-	bindRequest := &kubebindv1alpha2.BindableResourcesRequest{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "bind-request",
-		},
-		TemplateRef: kubebindv1alpha2.APIServiceExportTemplateRef{
-			Name: templateName,
-		},
-	}
-
-	return client.Bind(ctx, bindRequest)
-}

cli/pkg/kubectl/bind/plugin/bind.go

@@ -27,7 +27,6 @@ import (
 	"net/url"
 	"os/exec"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -62,19 +61,12 @@ type BindOptions struct {
 	printer printers.ResourcePrinter
 	DryRun  bool
 
-	// url is the argument accepted by the command. It contains the
-	// reference to where an APIService exists.
-	URL string
-
 	// skipKonnector skips the deployment of the konnector.
 	SkipKonnector bool
 
 	// The konnector image to use and override default konnector image
 	KonnectorImageOverride string
 
-	// Cluster is the cluster ID to use for binding (optional)
-	Cluster string
-
 	// Runner is runs the command. It can be replaced in tests.
 	Runner func(cmd *exec.Cmd) error
 
@@ -128,12 +120,12 @@ func (b *BindOptions) Complete(args []string) error {
 
 // Validate validates the BindOptions are complete and usable.
 func (b *BindOptions) Validate() error {
-	if b.URL == "" {
-		return fmt.Errorf("server URL is required - this should not happen after Complete()")
+	if b.Server == "" {
+		return fmt.Errorf("server is required")
 	}
 
-	if _, err := url.Parse(b.URL); err != nil {
-		return fmt.Errorf("invalid url %q: %w", b.URL, err)
+	if _, err := url.Parse(b.Server); err != nil {
+		return fmt.Errorf("invalid url %q: %w", b.Server, err)
 	}
 
 	return b.Options.Validate()
@@ -264,10 +256,8 @@ func (b *BindOptions) runWithCallback(ctx context.Context, _ chan<- string) erro
 
 // buildUIURL constructs the UI URL with callback parameters
 func (b *BindOptions) buildUIURL(callbackPort int, sessionID, clusterID string) (string, error) {
-	baseURL := strings.TrimSuffix(b.URL, "/")
-
 	// Parse the base URL
-	u, err := url.Parse(baseURL)
+	u, err := url.Parse(b.Server)
 	if err != nil {
 		return "", fmt.Errorf("invalid server URL: %w", err)
 	}

docs/content/setup/kcp-setup.md

@@ -165,23 +165,8 @@ kubectl ws create consumer --enter
 Generate the APIServiceExport YAML:
 
 ```bash
-./bin/kubectl-bind http://127.0.0.1:8080/clusters/<logical-cluster-id>/exports --dry-run -o yaml > apiserviceexport.yaml
-```
-
-Extract the kubeconfig for binding:
-
-```bash
-kubectl get secret <secret-name> -n kube-bind -o jsonpath='{.data.kubeconfig}' | base64 -d > remote.kubeconfig
-```
-
-Perform the binding:
-
-```bash
-./bin/kubectl-bind apiservice \
-  --remote-kubeconfig remote.kubeconfig \
-  -f apiserviceexport.yaml \
-  --skip-konnector \
-  --remote-namespace kube-bind-<random-suffix>
+./bin/kubectl-bind login http://127.0.0.1:8080 --cluster <logical-cluster-id>
+./bin/kubectl-bind --skip-konnector
 ```
 
 ### 3. Start Konnector
@@ -198,46 +183,3 @@ Create example resources:
 ```bash
 kubectl apply -f contrib/kcp/deploy/examples/cowboy.yaml
 ```
-
-## Advanced Features
-
-### Multiple Consumers
-
-You can create multiple consumer workspaces to test multi-tenant scenarios:
-
-```bash
-# Create second consumer
-cp .kcp/admin.kubeconfig .kcp/consumer2.kubeconfig
-export KUBECONFIG=.kcp/consumer2.kubeconfig
-kubectl ws use :root
-kubectl ws create consumer2 --enter
-
-# Repeat binding process with different namespace
-# Start konnector on different port
-go run ./cmd/konnector/ --lease-namespace default --server-address :8091
-```
-
-### Debugging
-
-To debug the setup, use the following commands:
-
-```bash
-# Switch to debug workspace
-cp .kcp/admin.kubeconfig .kcp/debug.kubeconfig
-export KUBECONFIG=.kcp/debug.kubeconfig
-kubectl ws use :root:kube-bind
-
-# Check available resources
-kubectl-s "$(kubectl get apiexportendpointslice kube-bind.io -o jsonpath="{.status.endpoints[0].url}")/clusters/*" api-resources
-
-# List CRDs
-kubectl-s "$(kubectl get apiexportendpointslice kube-bind.io -o jsonpath="{.status.endpoints[0].url}")/clusters/*" get crd
-```
-
-## Key Differences from Standard Setup
-
-- **Provider Selection**: Uses `--multicluster-runtime-provider kcp` flag
-- **Workspace Management**: Requires kcp workspace creation and management
-- **APIExport Integration**: Leverages kcp's APIExport mechanism to enable shared backed service.
-- **URL Structure**: Uses kcp-specific URLs with cluster identifiers. In production, this should be abstracted by a service wrapper.
-- **Advanced Isolation**: Provides workspace-level isolation beyond namespaces