From b5db485bd0bc533de3a6a870641e60052f290dbe Mon Sep 17 00:00:00 2001
From: cuisongliu <cuisongliu@qq.com>
Date: Thu, 24 Aug 2023 14:58:39 +0800
Subject: [PATCH] feature(main): using 22 default port (#3759)

Signed-off-by: cuisongliu <cuisongliu@qq.com>
---
 pkg/apply/run.go      | 12 ++++++++++--
 pkg/apply/run_test.go |  2 +-
 pkg/apply/utils.go    |  4 +---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkg/apply/run.go b/pkg/apply/run.go
index a1d239cd1fd..60de5804d36 100644
--- a/pkg/apply/run.go
+++ b/pkg/apply/run.go
@@ -117,7 +117,7 @@ func (r *ClusterArgs) runArgs(cmd *cobra.Command, args *RunArgs, imageList []str
 
 	r.cluster.SetNewImages(imageList)
 
-	defaultPort := strconv.Itoa(int(r.cluster.Spec.SSH.Port))
+	defaultPort := strconv.Itoa(int(defaultSSHPort(r.cluster.Spec.SSH.Port)))
 	masters := stringsutil.SplitRemoveEmpty(args.Cluster.Masters, ",")
 	nodes := stringsutil.SplitRemoveEmpty(args.Cluster.Nodes, ",")
 	r.hosts = []v2.Host{}
@@ -139,10 +139,11 @@ func (r *ClusterArgs) runArgs(cmd *cobra.Command, args *RunArgs, imageList []str
 }
 
 func (r *ClusterArgs) setHostWithIpsPort(ips []string, roles []string) {
-	defaultPort := strconv.Itoa(int(r.cluster.Spec.SSH.Port))
+	defaultPort := strconv.Itoa(int(defaultSSHPort(r.cluster.Spec.SSH.Port)))
 	hostMap := map[string]*v2.Host{}
 	for i := range ips {
 		ip, port := iputils.GetHostIPAndPortOrDefault(ips[i], defaultPort)
+		logger.Debug("defaultPort: %s", defaultPort)
 		socket := fmt.Sprintf("%s:%s", ip, port)
 		if stringsutil.In(socket, r.cluster.GetAllIPS()) {
 			continue
@@ -163,3 +164,10 @@ func (r *ClusterArgs) setHostWithIpsPort(ips []string, roles []string) {
 		r.hosts = append(r.hosts, *host)
 	}
 }
+
+func defaultSSHPort(port uint16) uint16 {
+	if port == 0 {
+		port = v2.DefaultSSHPort
+	}
+	return port
+}
diff --git a/pkg/apply/run_test.go b/pkg/apply/run_test.go
index 55616a6fa3b..01deca71e32 100644
--- a/pkg/apply/run_test.go
+++ b/pkg/apply/run_test.go
@@ -167,7 +167,7 @@ func TestNewApplierFromArgs(t *testing.T) {
 					},
 					Spec: v2.ClusterSpec{
 						Hosts: []v2.Host{
-							{IPS: []string{iputils.LocalIP(addr) + ":0"}, Roles: []string{v2.MASTER, GetHostArch(ssh.NewSSHClient(&v2.SSH{}, true), iputils.LocalIP(addr)+":0")}},
+							{IPS: []string{iputils.LocalIP(addr) + ":22"}, Roles: []string{v2.MASTER, GetHostArch(ssh.NewSSHClient(&v2.SSH{}, true), iputils.LocalIP(addr)+":22")}},
 						},
 						Image: []string{"labring/kubernetes:v1.24.0"},
 						SSH:   v2.SSH{},
diff --git a/pkg/apply/utils.go b/pkg/apply/utils.go
index 5c2ec303acc..d2efb6ad444 100644
--- a/pkg/apply/utils.go
+++ b/pkg/apply/utils.go
@@ -141,9 +141,7 @@ func GetNewImages(currentCluster, desiredCluster *v2.Cluster) []string {
 }
 
 func CheckAndInitialize(cluster *v2.Cluster) {
-	if cluster.Spec.SSH.Port == 0 {
-		cluster.Spec.SSH.Port = v2.DefaultSSHPort
-	}
+	cluster.Spec.SSH.Port = defaultSSHPort(cluster.Spec.SSH.Port)
 
 	if cluster.Spec.SSH.Pk == "" {
 		cluster.Spec.SSH.Pk = filepath.Join(constants.GetHomeDir(), ".ssh", "id_rsa")