Change IPs from external to local

Signed-off-by: Leonid Kondrashov <[email protected]>
vhive-serverless · Apr 10, 2024 · 848c27b · 848c27b
1 parent 5143a83
commit 848c27b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/scripts/cluster/create_multinode_cluster.go b/scripts/cluster/create_multinode_cluster.go
@@ -79,10 +79,11 @@ func CreateMasterKubeletService() error {
 	if !utils.CheckErrorWithMsg(err, "Failed to create kubelet service!\n") {
 		return err
 	}
+	nodeIP, _ := utils.GetNodeIP()
 	bashCmd := `sudo sh -c 'cat <<EOF > /etc/default/kubelet
-KUBELET_EXTRA_ARGS="--v=%d --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
+KUBELET_EXTRA_ARGS="--v=%d --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --node-ip %s"
 EOF'`
-	_, err = utils.ExecShellCmd(bashCmd, configs.System.LogVerbosity)
+	_, err = utils.ExecShellCmd(bashCmd, configs.System.LogVerbosity, nodeIP)
 	if !utils.CheckErrorWithMsg(err, "Failed to create kubelet service!\n") {
 		return err
 	}
@@ -98,7 +99,7 @@ EOF'`
 func DeployKubernetes() error {
 
 	utils.WaitPrintf("Deploying Kubernetes(version %s)", configs.Kube.K8sVersion)
-	masterNodeIp, iperr := utils.ExecShellCmd(`ip route | awk '{print $(NF)}' | awk '/^10\..*/'`)
+	masterNodeIp, iperr := utils.GetNodeIP()
 	if iperr != nil {
 		return iperr
 	}

diff --git a/scripts/cluster/setup_worker_kubelet.go b/scripts/cluster/setup_worker_kubelet.go
@@ -50,10 +50,11 @@ func CreateWorkerKubeletService(criSock string) error {
 	if !utils.CheckErrorWithMsg(err, "Failed to create kubelet service!\n") {
 		return err
 	}
+	nodeIP, _ := utils.GetNodeIP()
 	bashCmd := `sudo sh -c 'cat <<EOF > /etc/default/kubelet
-KUBELET_EXTRA_ARGS="--v=%d --runtime-request-timeout=15m --container-runtime-endpoint=unix://%s"
+KUBELET_EXTRA_ARGS="--v=%d --runtime-request-timeout=15m --container-runtime-endpoint=unix://%s --node-ip %s"
 EOF'`
-	_, err = utils.ExecShellCmd(bashCmd, configs.System.LogVerbosity, criSock)
+	_, err = utils.ExecShellCmd(bashCmd, configs.System.LogVerbosity, criSock, nodeIP)
 	if !utils.CheckErrorWithMsg(err, "Failed to create kubelet service!\n") {
 		return err
 	}

diff --git a/scripts/setup.go b/scripts/setup.go
@@ -238,6 +238,7 @@ func main() {
 
 	if err != nil {
 		utils.FatalPrintf("Faild subcommand: %s!\n", subCmd)
+		utils.ErrorPrintf("%v\n", err)
 		utils.CleanEnvironment()
 		os.Exit(1)
 	}

diff --git a/scripts/utils/utils.go b/scripts/utils/utils.go
@@ -171,3 +171,12 @@ func InstallYQ() {
 	_, err := ExecShellCmd(`sudo wget %s -O /usr/bin/yq && sudo chmod +x /usr/bin/yq`, yqUrl)
 	CheckErrorWithMsg(err, "Failed to add yq!\n")
 }
+
+func GetNodeIP() (string, error) {
+	nodeIP, err := ExecShellCmd(`ip route | awk '{print $(NF)}' | awk '/^10\..*/'`)
+	if err != nil {
+		CheckErrorWithMsg(err, "Failed to get node IP!\n")
+		return "", err
+	}
+	return nodeIP, nil
+}