Update node name for k3s,rke2,kubeadm

innobead · Jun 21, 2022 · 5ab8cc8 · 5ab8cc8
1 parent 5b7f6c0
commit 5ab8cc8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/pkg/bootstrap/k3s.go b/pkg/bootstrap/k3s.go
@@ -129,7 +129,7 @@ func (k *K3sBootstrapper) bootstrap(node *data.Node, isSingleNode bool, extraOpt
 	defer sshClient.Close()
 
 	deployCmdOpts := []string{
-		fmt.Sprintf(`--node-name=%s`, node.Status.IPAddresses),
+		fmt.Sprintf(`--node-name="%s"`, node.Name),
 	}
 	tokenBuf := bytes.Buffer{}
 
@@ -187,7 +187,9 @@ func (k *K3sBootstrapper) join(node *data.Node, apiServerAddress string, joinTok
 	}
 	defer sshClient.Close()
 
-	var deployCmdOpts []string
+	deployCmdOpts := []string{
+		fmt.Sprintf(`--node-name="%s"`, node.Name),
+	}
 	cmd := fmt.Sprintf(
 		"%s K3S_URL=https://%s:6443 K3S_TOKEN=%s k3s-install.sh",
 		config.K3sVersionsEnvVars(node.Spec.Cluster.Version).String(),

diff --git a/pkg/bootstrap/kubeadm.go b/pkg/bootstrap/kubeadm.go
@@ -256,19 +256,11 @@ func (k *KubeadmBootstrapper) bootstrap(node *data.Node, isSingleNode bool, opti
 	}{
 		{
 			cmdline: fmt.Sprintf(
-				`kubeadm init phase control-plane all -v 5 --apiserver-extra-args="%s" --controller-manager-extra-args="%s" --scheduler-extra-args="%s"`,
+				`kubeadm init -v 5 --node-name="%s" --apiserver-extra-args="%s" --controller-manager-extra-args="%s" --scheduler-extra-args="%s" --ignore-preflight-errors='%s' %s`,
+				node.Name,
 				strings.Join(options.generateControlPlaneComponentOptions(&options.ApiServerOptions), ","),
 				strings.Join(options.generateControlPlaneComponentOptions(&options.ControllerManagerOptions), ","),
 				strings.Join(options.generateControlPlaneComponentOptions(&options.SchedulerOptions), ","),
-			),
-			before: func(session *ssh.Session) bool {
-				logrus.Info("running kubeadm init")
-				return true
-			},
-		},
-		{
-			cmdline: fmt.Sprintf(
-				"kubeadm init -v 5 --skip-phases='control-plane' --ignore-preflight-errors='%s' %s",
 				strings.Join(ignoreErrors, ","),
 				strings.Join(options.generateKubeadmInitOptions(), " "),
 			),
@@ -331,7 +323,7 @@ func (k *KubeadmBootstrapper) join(node *data.Node, joinCmd string) error {
 
 	logrus.Infof("running join command (%s)", joinCmd)
 
-	if err := sshClient.Run(nil, nil, fmt.Sprintf("%s -v 5", joinCmd)); err != nil {
+	if err := sshClient.Run(nil, nil, fmt.Sprintf(`%s -v 5 --node-name="%s"`, joinCmd, node.Name)); err != nil {
 		return errors.WithStack(err)
 	}
 

diff --git a/pkg/bootstrap/rke2.go b/pkg/bootstrap/rke2.go
@@ -131,6 +131,7 @@ func (r *RKE2Bootstrapper) bootstrap(node *data.Node, isSingleNode bool, extraOp
 
 	joinToken := util.GenerateRandomStr(8)
 	deployCmdOpts := []string{
+		fmt.Sprintf(`--node-name="%s"`, node.Name),
 		fmt.Sprintf("--bind-address=%s", node.Status.IPAddresses),
 		fmt.Sprintf("--token=%s", joinToken),
 	}
@@ -195,6 +196,7 @@ func (r *RKE2Bootstrapper) join(node *data.Node, apiServerAddress string, joinTo
 	defer sshClient.Close()
 
 	deployCmdOpts := []string{
+		fmt.Sprintf(`--node-name="%s"`, node.Name),
 		fmt.Sprintf("--server=https://%s:9345", apiServerAddress),
 		fmt.Sprintf("--token=%s", joinToken),
 	}