Merge pull request #209 from jp-gouin/cli

add flag to override kubernetes server value in the generated kubeconfig
rancher · Jan 24, 2025 · 8f24151 · 8f24151
2 parents 8b0383f + ec93371
commit 8f24151
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 12 deletions.
diff --git a/cli/cmds/cluster/create.go b/cli/cmds/cluster/create.go
@@ -37,18 +37,19 @@ func init() {
 }
 
 var (
-	name             string
-	token            string
-	clusterCIDR      string
-	serviceCIDR      string
-	servers          int64
-	agents           int64
-	serverArgs       cli.StringSlice
-	agentArgs        cli.StringSlice
-	persistenceType  string
-	storageClassName string
-	version          string
-	mode             string
+	name                 string
+	token                string
+	clusterCIDR          string
+	serviceCIDR          string
+	servers              int64
+	agents               int64
+	serverArgs           cli.StringSlice
+	agentArgs            cli.StringSlice
+	persistenceType      string
+	storageClassName     string
+	version              string
+	mode                 string
+	kubeconfigServerHost string
 
 	clusterCreateFlags = []cli.Flag{
 		&cli.StringFlag{
@@ -115,6 +116,12 @@ var (
 			Destination: &mode,
 			Value:       "shared",
 		},
+		&cli.StringFlag{
+			Name:        "kubeconfig-server",
+			Usage:       "override the kubeconfig server host",
+			Destination: &kubeconfigServerHost,
+			Value:       "",
+		},
 	}
 )
 
@@ -169,6 +176,9 @@ func create(clx *cli.Context) error {
 		return err
 	}
 	host := strings.Split(url.Host, ":")
+	if kubeconfigServerHost != "" {
+		host = []string{kubeconfigServerHost}
+	}
 	cluster.Spec.TLSSANs = []string{host[0]}
 
 	if err := ctrlClient.Create(ctx, cluster); err != nil {

diff --git a/cli/cmds/kubeconfig/kubeconfig.go b/cli/cmds/kubeconfig/kubeconfig.go
@@ -38,6 +38,7 @@ var (
 	altNames                cli.StringSlice
 	expirationDays          int64
 	configName              string
+	kubeconfigServerHost    string
 	generateKubeconfigFlags = []cli.Flag{
 		&cli.StringFlag{
 			Name:        "name",
@@ -71,6 +72,12 @@ var (
 			Destination: &expirationDays,
 			Value:       356,
 		},
+		&cli.StringFlag{
+			Name:        "kubeconfig-server",
+			Usage:       "override the kubeconfig server host",
+			Destination: &kubeconfigServerHost,
+			Value:       "",
+		},
 	}
 )
 
@@ -121,6 +128,13 @@ func generate(clx *cli.Context) error {
 		return err
 	}
 	host := strings.Split(url.Host, ":")
+	if kubeconfigServerHost != "" {
+		host = []string{kubeconfigServerHost}
+		err := altNames.Set(kubeconfigServerHost)
+		if err != nil {
+			return err
+		}
+	}
 
 	certAltNames := certs.AddSANs(altNames.Value())