fix(autok3s): fix ssh command input not work

Signed-off-by: NewGr8Player <273221594@qq.com>
cnrancher · Oct 14, 2020 · c720981 · c720981
1 parent b667789
commit c720981
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/cmd/ssh.go b/cmd/ssh.go
@@ -79,7 +79,7 @@ func SSHCommand() *cobra.Command {
 
 		sp.GenerateClusterName()
 
-		if err := sp.SSHK3sNode(); err != nil {
+		if err := sp.SSHK3sNode(sSSH); err != nil {
 			logrus.Fatalln(err)
 		}
 	}

diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -291,21 +291,49 @@ func JoinK3sNode(merged, added *types.Cluster) error {
 	return nil
 }
 
-func SSHK3sNode(ip string, cluster *types.Cluster) error {
+func SSHK3sNode(ip string, cluster *types.Cluster, ssh *types.SSH) error {
 	var node types.Node
 
 	for _, n := range cluster.Status.MasterNodes {
 		if n.PublicIPAddress[0] == ip {
 			node = n
+			break
 		}
 	}
 
 	for _, n := range cluster.Status.WorkerNodes {
 		if n.PublicIPAddress[0] == ip {
 			node = n
+			break
 		}
 	}
 
+	node.SSH.User = ssh.User
+	node.SSH.Port = ssh.Port
+	if ssh.Password != "" {
+		node.SSH.Password = ssh.Password
+	}
+	if ssh.SSHKey != "" {
+		node.SSH.SSHKey = ssh.SSHKey
+	}
+	if ssh.SSHKeyPath != "" {
+		node.SSH.SSHKeyPath = ssh.SSHKeyPath
+	}
+	if ssh.SSHCert != "" {
+		node.SSH.SSHCert = ssh.SSHCert
+	}
+	if ssh.SSHCertPath != "" {
+		node.SSH.SSHCertPath = ssh.SSHCertPath
+	}
+	if ssh.SSHKeyPassphrase != "" {
+		node.SSH.SSHKeyPassphrase = ssh.SSHKeyPassphrase
+	}
+	if ssh.SSHAgentAuth {
+		node.SSH.SSHAgentAuth = ssh.SSHAgentAuth
+	}
+	if node.PublicIPAddress == nil {
+		node.PublicIPAddress = []string{ip}
+	}
 	return terminal(&hosts.Host{Node: node})
 }
 

diff --git a/pkg/providers/alibaba/alibaba.go b/pkg/providers/alibaba/alibaba.go
@@ -331,7 +331,7 @@ func (p *Alibaba) StopK3sCluster(f bool) error {
 	return nil
 }
 
-func (p *Alibaba) SSHK3sNode() error {
+func (p *Alibaba) SSHK3sNode(ssh *types.SSH) error {
 	p.logger = common.NewLogger(common.Debug)
 	p.logger.Infof("[%s] executing ssh logic...\n", p.GetProviderName())
 
@@ -397,7 +397,7 @@ func (p *Alibaba) SSHK3sNode() error {
 	}
 
 	// ssh K3s node.
-	if err := cluster.SSHK3sNode(ip, c); err != nil {
+	if err := cluster.SSHK3sNode(ip, c, ssh); err != nil {
 		return err
 	}
 

diff --git a/pkg/providers/native/native.go b/pkg/providers/native/native.go
@@ -194,7 +194,7 @@ func (p *Native) JoinK3sNode(ssh *types.SSH) (err error) {
 	return nil
 }
 
-func (p *Native) SSHK3sNode() error {
+func (p *Native) SSHK3sNode(ssh *types.SSH) error {
 	p.logger = common.NewLogger(common.Debug)
 	p.logger.Infof("[%s] executing ssh logic...\n", p.GetProviderName())
 
@@ -218,7 +218,7 @@ func (p *Native) SSHK3sNode() error {
 		return fmt.Errorf("[%s] choose incorrect ssh node", p.GetProviderName())
 	}
 	// ssh K3s node.
-	if err := cluster.SSHK3sNode(ip, c); err != nil {
+	if err := cluster.SSHK3sNode(ip, c, ssh); err != nil {
 		return err
 	}
 

diff --git a/pkg/providers/provider.go b/pkg/providers/provider.go
@@ -55,7 +55,7 @@ type Provider interface {
 	// K3s stop cluster interface.
 	StopK3sCluster(f bool) error
 	// K3s ssh node interface.
-	SSHK3sNode() error
+	SSHK3sNode(ssh *types.SSH) error
 	// K3s check cluster exist.
 	IsClusterExist() (bool, []string, error)
 	// Rollback when error occurs.