fix docker cert not send when sealer join command add node (sealerio#998

)
Stevent-fei · Dec 30, 2021 · 8645fde · 8645fde
1 parent deb7d48
commit 8645fde
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/pkg/filesystem/filesystem.go b/pkg/filesystem/filesystem.go
@@ -208,6 +208,7 @@ func unmountRootfs(ipList []string, cluster *v2.Cluster) error {
 	clusterRootfsDir := common.DefaultTheClusterRootfsDir(cluster.Name)
 	execClean := fmt.Sprintf("/bin/bash -c "+common.DefaultClusterClearBashFile, cluster.Name)
 	rmRootfs := fmt.Sprintf("rm -rf %s", clusterRootfsDir)
+	rmDockerCert := fmt.Sprintf("rm -rf %s/%s*", runtime.DockerCertDir, runtime.SeaHub)
 	envProcessor := env.NewEnvProcessor(cluster)
 	for _, IP := range ipList {
 		wg.Add(1)
@@ -221,7 +222,7 @@ func unmountRootfs(ipList []string, cluster *v2.Cluster) error {
 				mutex.Unlock()
 				return
 			}
-			cmd := fmt.Sprintf("%s && %s", execClean, rmRootfs)
+			cmd := fmt.Sprintf("%s && %s && %s", execClean, rmRootfs, rmDockerCert)
 			if mounted, _ := mount.GetRemoteMountDetails(SSH, ip, clusterRootfsDir); mounted {
 				cmd = fmt.Sprintf("umount %s && %s", clusterRootfsDir, cmd)
 			}

diff --git a/pkg/runtime/init.go b/pkg/runtime/init.go
@@ -126,7 +126,7 @@ func (k *KubeadmRuntime) GenerateCert() error {
 	if err != nil {
 		return err
 	}
-	return k.sendRegistryCert(append(k.getMasterIPList(), k.getNodesIPList()...))
+	return k.sendRegistryCert(k.getMasterIPList()[:1])
 }
 
 func (k *KubeadmRuntime) CreateKubeConfig() error {

diff --git a/pkg/runtime/masters.go b/pkg/runtime/masters.go
@@ -335,6 +335,9 @@ func (k *KubeadmRuntime) joinMasters(masters []string) error {
 	if err := k.SendJoinMasterKubeConfigs(masters, AdminConf, ControllerConf, SchedulerConf); err != nil {
 		return err
 	}
+	if err := k.sendRegistryCert(masters); err != nil {
+		return err
+	}
 	// TODO only needs send ca?
 	if err := k.sendNewCertAndKey(masters); err != nil {
 		return err

diff --git a/pkg/runtime/nodes.go b/pkg/runtime/nodes.go
@@ -60,6 +60,9 @@ func (k *KubeadmRuntime) joinNodes(nodes []string) error {
 	if err := k.WaitSSHReady(6, nodes...); err != nil {
 		return errors.Wrap(err, "join nodes wait for ssh ready time out")
 	}
+	if err := k.sendRegistryCert(nodes); err != nil {
+		return err
+	}
 	if err := k.GetJoinTokenHashAndKey(); err != nil {
 		return err
 	}