From fd64c55e5cfb0d67bf0e460a65c8443b7aa62235 Mon Sep 17 00:00:00 2001
From: Enrico Candino <enrico.candino@suse.com>
Date: Thu, 23 Jul 2026 12:26:10 +0200
Subject: [PATCH] Add server URL handling in cluster creation and enhance
 kubeconfig tests (#1050)

---
 cli/cmds/cluster_create.go | 10 +++++++
 tests/cli/cli_test.go      | 56 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/cli/cmds/cluster_create.go b/cli/cmds/cluster_create.go
index f032d430..b3077d05 100644
--- a/cli/cmds/cluster_create.go
+++ b/cli/cmds/cluster_create.go
@@ -29,6 +29,7 @@ import (
 	"github.com/rancher/k3k/pkg/apis/k3k.io/v1beta1"
 	"github.com/rancher/k3k/pkg/controller"
 	k3kcluster "github.com/rancher/k3k/pkg/controller/cluster"
+	"github.com/rancher/k3k/pkg/controller/cluster/server"
 )
 
 type CreateConfig struct {
@@ -198,6 +199,15 @@ func createAction(appCtx *AppContext, config *CreateConfig) func(cmd *cobra.Comm
 			return err
 		}
 
+		serverURL, err := server.ServerURL(ctx, client, cluster, host)
+		if err != nil {
+			return err
+		}
+
+		for _, kubeCluster := range kubeconfig.Clusters {
+			kubeCluster.Server = serverURL.String()
+		}
+
 		if err := writeKubeconfigFile(cluster, kubeconfig, ""); err != nil {
 			return err
 		}
diff --git a/tests/cli/cli_test.go b/tests/cli/cli_test.go
index d6ce52e7..c7a1d894 100644
--- a/tests/cli/cli_test.go
+++ b/tests/cli/cli_test.go
@@ -3,11 +3,16 @@ package cli_test
 import (
 	"bytes"
 	"context"
+	"fmt"
+	"os"
 	"os/exec"
+	"path/filepath"
 	"time"
 
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/rand"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/clientcmd"
 
 	corev1 "k8s.io/api/core/v1"
 
@@ -39,6 +44,27 @@ func runCmd(cmdName string, args ...string) (string, string, error) {
 	return stdout.String(), stderr.String(), err
 }
 
+func checkCluster(path string) {
+	GinkgoHelper()
+
+	data, err := os.ReadFile(path)
+	Expect(err).To(Not(HaveOccurred()))
+
+	restCfg, err := clientcmd.RESTConfigFromKubeConfig(data)
+	Expect(err).To(Not(HaveOccurred()))
+
+	cs, err := kubernetes.NewForConfig(restCfg)
+	Expect(err).To(Not(HaveOccurred()))
+
+	Eventually(func() error {
+		_, err := cs.Discovery().ServerVersion()
+		return err
+	}).
+		WithTimeout(time.Minute).
+		WithPolling(time.Second * 5).
+		Should(Succeed())
+}
+
 var _ = When("using the k3kcli", Label("cli"), func() {
 	It("can get the version", func() {
 		stdout, _, err := K3kcli("--version")
@@ -68,6 +94,19 @@ var _ = When("using the k3kcli", Label("cli"), func() {
 			Expect(err).To(Not(HaveOccurred()), string(stderr))
 			Expect(stderr).To(ContainSubstring("You can start using the cluster"))
 
+			By("Connecting to the cluster with the generated kubeconfig")
+
+			cwd, err := os.Getwd()
+			Expect(err).To(Not(HaveOccurred()))
+
+			kubeconfig := filepath.Join(cwd, fmt.Sprintf("%s-%s-kubeconfig.yaml", clusterNamespace, clusterName))
+
+			DeferCleanup(func() {
+				_ = os.Remove(kubeconfig)
+			})
+
+			checkCluster(kubeconfig)
+
 			By("Listing the clusters")
 
 			stdout, stderr, err = K3kcli("cluster", "list")
@@ -475,18 +514,35 @@ var _ = When("using the k3kcli", Label("cli"), func() {
 				fwk3k.DeleteNamespaces(k8s, clusterNamespace)
 			})
 
+			cwd, err := os.Getwd()
+			Expect(err).To(Not(HaveOccurred()))
+
+			kubeconfig := filepath.Join(cwd, fmt.Sprintf("%s-%s-kubeconfig.yaml", clusterNamespace, clusterName))
+
+			DeferCleanup(func() {
+				_ = os.Remove(kubeconfig)
+			})
+
 			By("Creating the cluster")
 
 			_, stderr, err = K3kcli("cluster", "create", "--namespace", clusterNamespace, clusterName)
 			Expect(err).To(Not(HaveOccurred()), string(stderr))
 			Expect(stderr).To(ContainSubstring("You can start using the cluster"))
 
+			By("Connecting with the kubeconfig written by cluster create")
+
+			checkCluster(kubeconfig)
+
 			By("Generating the kubeconfig")
 
 			_, stderr, err = K3kcli("kubeconfig", "generate", "--namespace", clusterNamespace, "--name", clusterName)
 			Expect(err).To(Not(HaveOccurred()), string(stderr))
 			Expect(stderr).To(ContainSubstring("You can start using the cluster"))
 
+			By("Connecting with the kubeconfig written by kubeconfig generate")
+
+			checkCluster(kubeconfig)
+
 			_, stderr, err = K3kcli("cluster", "delete", "--namespace", clusterNamespace, clusterName)
 			Expect(err).To(Not(HaveOccurred()), string(stderr))
 			Expect(stderr).To(ContainSubstring(`Deleting '%s' cluster in namespace '%s'`, clusterName, clusterNamespace))