moved config change to app layer

Author: vertex451

listener/reconciler/kcp/helper_functions.go

@@ -0,0 +1,48 @@
+package kcp
+
+import (
+	"net/url"
+	"strings"
+)
+
+// stripAPIExportPath removes APIExport virtual workspace paths from a URL to get the base KCP host
+func stripAPIExportPath(hostURL string) string {
+	parsedURL, err := url.Parse(hostURL)
+	if err != nil {
+		// If we can't parse the URL, return it as-is
+		return hostURL
+	}
+
+	// Check if the path contains an APIExport pattern: /services/apiexport/...
+	if strings.HasPrefix(parsedURL.Path, "/services/apiexport/") {
+		// Strip the APIExport path to get the base KCP host
+		parsedURL.Path = ""
+		return parsedURL.String()
+	}
+
+	// If it's not an APIExport URL, return as-is
+	return hostURL
+}
+
+// extractClusterHashFromAPIExportURL extracts the cluster hash from an APIExport URL
+// Expected format: https://host/services/apiexport/{cluster-hash}/{apiexport-name}/
+func extractClusterHashFromAPIExportURL(hostURL string) string {
+	parsedURL, err := url.Parse(hostURL)
+	if err != nil {
+		return ""
+	}
+
+	// Check if this is an APIExport URL
+	if !strings.HasPrefix(parsedURL.Path, "/services/apiexport/") {
+		return ""
+	}
+
+	// Split the path and extract the cluster hash
+	pathParts := strings.Split(strings.Trim(parsedURL.Path, "/"), "/")
+	// Expected: ["services", "apiexport", "{cluster-hash}", "{apiexport-name}"]
+	if len(pathParts) >= 3 && pathParts[0] == "services" && pathParts[1] == "apiexport" {
+		return pathParts[2] // This is the cluster hash
+	}
+
+	return ""
+}

listener/reconciler/kcp/reconciler.go

@@ -72,13 +72,26 @@ func NewKCPManager(
 	// to discover workspaces, not the base KCP host
 	apiexportConfig := rest.CopyConfig(opts.Config)
 
-	// Construct the APIExport URL from the base host
-	// We know the APIExport name is "core.platform-mesh.io" and we need to find the cluster hash
-	baseHost := opts.Config.Host
+	// Extract base KCP host from kubeconfig, stripping any APIExport paths
+	// This ensures we work with both base KCP hosts and APIExport URLs in kubeconfig
+	originalHost := opts.Config.Host
+	baseHost := stripAPIExportPath(originalHost)
 
-	// For now, we'll construct a known APIExport URL
-	// TODO: This should be made configurable or discovered dynamically
-	apiexportURL := baseHost + "/services/apiexport/1mx3340lwq4c8kkw/core.platform-mesh.io/"
+	log.Info().
+		Str("originalHost", originalHost).
+		Str("baseHost", baseHost).
+		Msg("Extracted base KCP host from kubeconfig")
+
+	// Construct the APIExport URL for multicluster-provider discovery
+	// We need to extract the cluster hash from the original APIExport URL if present
+	clusterHash := extractClusterHashFromAPIExportURL(originalHost)
+	if clusterHash == "" {
+		// Fallback to a known cluster hash - this should be made configurable
+		clusterHash = "1mx3340lwq4c8kkw"
+		log.Warn().Str("fallbackHash", clusterHash).Msg("Could not extract cluster hash from kubeconfig, using fallback")
+	}
+
+	apiexportURL := fmt.Sprintf("%s/services/apiexport/%s/core.platform-mesh.io/", baseHost, clusterHash)
 
 	log.Info().Str("baseHost", baseHost).Str("apiexportURL", apiexportURL).Msg("Using APIExport URL for multicluster provider")
 	apiexportConfig.Host = apiexportURL
@@ -253,7 +266,9 @@ func (m *KCPManager) generateAndWriteSchemaForWorkspace(ctx context.Context, wor
 	// The multicluster-provider is only used for workspace discovery in the listener
 	// The gateway will use standard Kubernetes clients with direct workspace URLs
 	baseConfig := m.mcMgr.GetLocalManager().GetConfig()
-	baseHost := baseConfig.Host
+
+	// Strip APIExport path from the base config host to get the clean KCP host
+	baseHost := stripAPIExportPath(baseConfig.Host)
 
 	// Construct direct workspace URL like main branch: /clusters/{workspace}
 	directWorkspaceHost := fmt.Sprintf("%s/clusters/%s", baseHost, workspacePath)