From dabbe4c25eae2c46f861ab4fc23b837534a94603 Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期三, 31 五月 2023 19:32:14 +0800
Subject: [PATCH] k8s部署时通过环境变量传递数据库连接字符串

---
 src/util/util.go |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/util/util.go b/src/util/util.go
index 08caedd..f396fcd 100644
--- a/src/util/util.go
+++ b/src/util/util.go
@@ -100,17 +100,17 @@
 func InstallDocker(nodeIP, sshUsername, sshPassword string, sshPort int) error {
 	// 妫�鏌ocker鏄惁宸插畨瑁�
 	checkCommand := "which docker"
-	_, err := sshExec(nodeIP, sshUsername, sshPassword, checkCommand, sshPort)
+	_, err := SSHExec(nodeIP, sshUsername, sshPassword, checkCommand, sshPort)
 	if err == nil {
 		fmt.Println("Docker is already installed on the remote server.")
 		return nil
 	}
 
 	// 瀹夎Docker
-	installCommand := "sudo curl -fsSL https://get.docker.com -o get-docker.sh && sudo sh get-docker.sh"
-	_, err = sshExec(nodeIP, sshUsername, sshPassword, installCommand, sshPort)
+	installCommand := "sudo curl -fsSL https://get.docker.com -o get-docker.sh && sudo sh get-docker.sh && sudo systemctl start docker && sudo systemctl enable docker"
+	_, err = SSHExec(nodeIP, sshUsername, sshPassword, installCommand, sshPort)
 	if err != nil {
-		return fmt.Errorf("failed to install Docker on the remote server: %v", err)
+		return fmt.Errorf("failed to install Docker on the remote server:%v %v", nodeIP, err)
 	}
 
 	fmt.Println("Docker has been installed on the remote server.")
@@ -129,7 +129,7 @@
 func InstallKubectl(nodeIP, sshUsername, sshPassword string, sshPort int) error {
 	// 妫�鏌ubectl鏄惁宸插畨瑁�
 	checkCommand := "which kubectl"
-	_, err := sshExec(nodeIP, sshUsername, sshPassword, checkCommand, sshPort)
+	_, err := SSHExec(nodeIP, sshUsername, sshPassword, checkCommand, sshPort)
 	if err == nil {
 		fmt.Println("kubectl is already installed on the remote server.")
 		return nil
@@ -137,7 +137,7 @@
 
 	// 瀹夎kubectl
 	installCommand := "sudo curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && sudo chmod +x kubectl && sudo mv kubectl /usr/local/bin/"
-	_, err = sshExec(nodeIP, sshUsername, sshPassword, installCommand, sshPort)
+	_, err = SSHExec(nodeIP, sshUsername, sshPassword, installCommand, sshPort)
 	if err != nil {
 		return fmt.Errorf("failed to install kubectl on the remote server: %v", err)
 	}

--
Gitblit v1.8.0