refactor: capture loop variables to avoid closure issues in goroutines across multiple files

cuisongliu · cuisongliu · commit b4842a0f0ee8 · 2025-10-20T13:16:26.000+08:00
Signed-off-by: cuisongliu &lt;cuisongliu@qq.com&gt;
diff --git a/lifecycle/cmd/sealos/cmd/exec.go b/lifecycle/cmd/sealos/cmd/exec.go
@@ -88,10 +88,10 @@ func runCommand(cluster *v2.Cluster, targets, args []string) error {
 		return err
 	}
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, ipAddr := range targets {
-		ipAddr := ipAddr
+	for i := range targets {
+		addr := targets[i]
 		eg.Go(func() error {
-			return execer.CmdAsync(ipAddr, args...)
+			return execer.CmdAsync(addr, args...)
 		})
 	}
 	return eg.Wait()
diff --git a/lifecycle/cmd/sealos/cmd/scp.go b/lifecycle/cmd/sealos/cmd/scp.go
@@ -72,10 +72,10 @@ func runCopy(cluster *v1beta1.Cluster, targets, args []string) error {
 		return err
 	}
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, ipAddr := range targets {
-		ipAddr := ipAddr
+	for i := range targets {
+		addr := targets[i]
 		eg.Go(func() error {
-			return execer.Copy(ipAddr, args[0], args[1])
+			return execer.Copy(addr, args[0], args[1])
 		})
 	}
 	if err = eg.Wait(); err != nil {
diff --git a/lifecycle/pkg/apply/applydrivers/apply_drivers_default.go b/lifecycle/pkg/apply/applydrivers/apply_drivers_default.go
@@ -336,10 +336,10 @@ func (c *Applier) syncWorkdir() {
 		logger.Error("failed to create ssh client: %v", err)
 	}
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, ipAddr := range ipList {
-		ipAddr := ipAddr
+	for i := range ipList {
+		addr := ipList[i]
 		eg.Go(func() error {
-			return execer.Copy(ipAddr, workDir, workDir)
+			return execer.Copy(addr, workDir, workDir)
 		})
 	}
 	if err := eg.Wait(); err != nil {
diff --git a/lifecycle/pkg/apply/processor/create.go b/lifecycle/pkg/apply/processor/create.go
@@ -120,8 +120,8 @@ func (c *CreateProcessor) preProcess(cluster *v2.Cluster) error {
 func (c *CreateProcessor) RunConfig(cluster *v2.Cluster) error {
 	logger.Info("Executing pipeline RunConfig in CreateProcessor.")
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, cManifest := range cluster.Status.Mounts {
-		cManifest := cManifest
+	for i := range cluster.Status.Mounts {
+		cManifest := cluster.Status.Mounts[i]
 		eg.Go(func() error {
 			cfg := config.NewConfiguration(
 				cManifest.ImageName,
diff --git a/lifecycle/pkg/apply/processor/delete.go b/lifecycle/pkg/apply/processor/delete.go
@@ -114,8 +114,8 @@ func (d *DeleteProcessor) UnMountRootfs(cluster *v2.Cluster) error {
 
 func (d *DeleteProcessor) UnMountImage(cluster *v2.Cluster) error {
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, mount := range cluster.Status.Mounts {
-		mount := mount
+	for i := range cluster.Status.Mounts {
+		mount := cluster.Status.Mounts[i]
 		eg.Go(func() error {
 			return d.Buildah.Delete(mount.Name)
 		})
diff --git a/lifecycle/pkg/apply/processor/install.go b/lifecycle/pkg/apply/processor/install.go
@@ -239,8 +239,8 @@ func (c *InstallProcessor) RunConfig(_ *v2.Cluster) error {
 		return nil
 	}
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, cManifest := range c.NewMounts {
-		cManifest := cManifest
+	for i := range c.NewMounts {
+		cManifest := c.NewMounts[i]
 		eg.Go(func() error {
 			cfg := config.NewConfiguration(
 				cManifest.ImageName,
diff --git a/lifecycle/pkg/apply/processor/scale.go b/lifecycle/pkg/apply/processor/scale.go
@@ -263,8 +263,8 @@ func (c *ScaleProcessor) PreProcessImage(cluster *v2.Cluster) error {
 func (c *ScaleProcessor) RunConfig(cluster *v2.Cluster) error {
 	logger.Info("Executing pipeline RunConfig in ScaleProcessor.")
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, cManifest := range cluster.Status.Mounts {
-		cManifest := cManifest
+	for i := range cluster.Status.Mounts {
+		cManifest := cluster.Status.Mounts[i]
 		eg.Go(func() error {
 			cfg := config.NewConfiguration(
 				cManifest.ImageName,
diff --git a/lifecycle/pkg/buildah/create.go b/lifecycle/pkg/buildah/create.go
@@ -161,14 +161,14 @@ func runRender(mountPoints, env []string) error {
 	eg, _ := errgroup.WithContext(context.Background())
 	envs := maps.FromSlice(env)
 
-	for _, mountPoint := range mountPoints {
-		mountPoint := mountPoint
+	for i := range mountPoints {
+		path := mountPoints[i]
 		eg.Go(func() error {
-			if !file.IsExist(mountPoint) {
-				logger.Debug("MountPoint %s does not exist, skipping", mountPoint)
+			if !file.IsExist(path) {
+				logger.Debug("MountPoint %s does not exist, skipping", path)
 				return nil
 			}
-			return stringsutil.RenderTemplatesWithEnv(mountPoint, envs)
+			return stringsutil.RenderTemplatesWithEnv(path, envs)
 		})
 	}
 
diff --git a/lifecycle/pkg/buildah/manifest.go b/lifecycle/pkg/buildah/manifest.go
@@ -988,7 +988,7 @@ func manifestInspect(
 		if latestErr == nil {
 			latestErr = e
 		} else {
-			latestErr = fmt.Errorf("tried %v: %w", e, latestErr)
+			latestErr = errors.Join(fmt.Errorf("tried %w", e), latestErr)
 		}
 	}
 
diff --git a/lifecycle/pkg/filesystem/rootfs/rootfs_default.go b/lifecycle/pkg/filesystem/rootfs/rootfs_default.go
@@ -57,8 +57,8 @@ func (f *defaultRootfs) mountRootfs(cluster *v2.Cluster, ipList []string) error
 	eg, _ := errgroup.WithContext(ctx)
 	envProcessor := env.NewEnvProcessor(cluster)
 	// TODO: remove this when rendering on client side is GA
-	for _, mount := range f.mounts {
-		mount := mount
+	for i := range f.mounts {
+		mount := f.mounts[i]
 		eg.Go(func() error {
 			if !file.IsExist(mount.MountPoint) {
 				logger.Debug("Image %s not exist, render env continue", mount.ImageName)
@@ -120,8 +120,8 @@ func (f *defaultRootfs) mountRootfs(cluster *v2.Cluster, ipList []string) error
 	}
 	rootfsEnvs := v2.MergeEnvWithBuiltinKeys(rootfs.Env, *rootfs)
 
-	for _, ip := range ipList {
-		ip := ip
+	for i := range ipList {
+		ip := ipList[i]
 		eg.Go(func() error {
 			var renderingRequired bool
 			for i := range f.mounts {
@@ -192,8 +192,8 @@ func (f *defaultRootfs) unmountRootfs(cluster *v2.Cluster, ipList []string) erro
 		return err
 	}
 
-	for _, ip := range ipList {
-		ip := ip
+	for i := range ipList {
+		ip := ipList[i]
 		eg.Go(func() error {
 			return execer.CmdAsync(ip, rmRootfs, deleteHomeDirCmd)
 		})
diff --git a/lifecycle/pkg/runtime/k3s/bootstrap.go b/lifecycle/pkg/runtime/k3s/bootstrap.go
@@ -267,8 +267,8 @@ func (k *K3s) copyKubeConfigFileToNodes(hosts ...string) error {
 		return errors.WithMessage(err, "write admin.config file failed")
 	}
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, node := range hosts {
-		node := node
+	for i := range hosts {
+		node := hosts[i]
 		eg.Go(func() error {
 			home, err := k.execer.CmdToString(node, "echo $HOME", "")
 			if err != nil {
diff --git a/lifecycle/pkg/runtime/k3s/k3s.go b/lifecycle/pkg/runtime/k3s/k3s.go
@@ -134,8 +134,8 @@ func (k *K3s) SyncNodeIPVS(mastersIPList, nodeIPList []string) error {
 	}
 	image := k.cluster.GetLvscareImage()
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, node := range nodeIPList {
-		node := node
+	for i := range nodeIPList {
+		node := nodeIPList[i]
 		eg.Go(func() error {
 			logger.Info("start to sync lvscare static pod to node: %s master: %+v", node, masters)
 			err := k.remoteUtil.StaticPod(
diff --git a/lifecycle/pkg/runtime/kubernetes/certs.go b/lifecycle/pkg/runtime/kubernetes/certs.go
@@ -191,8 +191,9 @@ func (k *KubeadmRuntime) deleteAPIServer() error {
 	}
 	logger.Info("delete pod apiserver from crictl")
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, master := range k.getMasterIPAndPortList() {
-		master := master
+	masters := k.getMasterIPAndPortList()
+	for i := range masters {
+		master := masters[i]
 		eg.Go(func() error {
 			podIDJson, err := k.sshCmdToString(master, podIDSh)
 			if err != nil {
diff --git a/lifecycle/pkg/runtime/kubernetes/kubeconfig.go b/lifecycle/pkg/runtime/kubernetes/kubeconfig.go
@@ -28,8 +28,8 @@ const copyKubeAdminConfigCommand = `rm -rf $HOME/.kube/config && mkdir -p $HOME/
 func (k *KubeadmRuntime) copyKubeConfigFileToNodes(hosts ...string) error {
 	src := k.pathResolver.AdminFile()
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, node := range hosts {
-		node := node
+	for i := range hosts {
+		node := hosts[i]
 		eg.Go(func() error {
 			home, err := k.execer.CmdToString(node, "echo $HOME", "")
 			if err != nil {
diff --git a/lifecycle/pkg/runtime/kubernetes/master.go b/lifecycle/pkg/runtime/kubernetes/master.go
@@ -113,8 +113,8 @@ func (k *KubeadmRuntime) imagePull(hostAndPort, version string) error {
 // sendJoinCPConfig send join CP masters configuration
 func (k *KubeadmRuntime) sendJoinCPConfig(joinMaster []string) error {
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, master := range joinMaster {
-		master := master
+	for i := range joinMaster {
+		master := joinMaster[i]
 		eg.Go(func() error {
 			k.mu.Lock()
 			defer k.mu.Unlock()
@@ -224,8 +224,8 @@ func (k *KubeadmRuntime) deleteMasters(masters []string) error {
 		return nil
 	}
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, master := range masters {
-		master := master
+	for i := range masters {
+		master := masters[i]
 		eg.Go(func() error {
 			logger.Info("start to delete master %s", master)
 			if err := k.deleteMaster(master); err != nil {
diff --git a/lifecycle/pkg/runtime/kubernetes/node.go b/lifecycle/pkg/runtime/kubernetes/node.go
@@ -40,8 +40,8 @@ func (k *KubeadmRuntime) joinNodes(newNodesIPList []string) error {
 		return err
 	}
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, node := range newNodesIPList {
-		node := node
+	for i := range newNodesIPList {
+		node := newNodesIPList[i]
 		eg.Go(func() error {
 			logger.Info("start to join %s as worker", node)
 			k.mu.Lock()
@@ -101,8 +101,8 @@ func (k *KubeadmRuntime) deleteNodes(nodes []string) error {
 		return nil
 	}
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, node := range nodes {
-		node := node
+	for i := range nodes {
+		node := nodes[i]
 		eg.Go(func() error {
 			logger.Info("start to delete worker %s", node)
 			if err := k.deleteNode(node); err != nil {
diff --git a/lifecycle/pkg/runtime/kubernetes/reset.go b/lifecycle/pkg/runtime/kubernetes/reset.go
@@ -41,8 +41,8 @@ func (k *KubeadmRuntime) reset() error {
 func (k *KubeadmRuntime) resetNodes(nodes []string) {
 	logger.Info("start to reset nodes: %v", nodes)
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, node := range nodes {
-		node := node
+	for i := range nodes {
+		node := nodes[i]
 		eg.Go(func() error {
 			if err := k.resetNode(node, nil); err != nil {
 				logger.Error("delete node %s failed %v", node, err)
diff --git a/lifecycle/pkg/runtime/kubernetes/runtime_getter.go b/lifecycle/pkg/runtime/kubernetes/runtime_getter.go
@@ -102,8 +102,8 @@ func (k *KubeadmRuntime) syncNodeIPVSYaml(masterIPs, nodesIPs []string) error {
 	}
 
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, node := range nodesIPs {
-		node := node
+	for i := range nodesIPs {
+		node := nodesIPs[i]
 		eg.Go(func() error {
 			logger.Info("start to sync lvscare static pod to node: %s master: %+v", node, masters)
 			err := k.execIPVSPod(node, masters)
diff --git a/lifecycle/pkg/runtime/kubernetes/static_files.go b/lifecycle/pkg/runtime/kubernetes/static_files.go
@@ -57,8 +57,8 @@ func (k *KubeadmRuntime) copyStaticFiles(nodes []string) error {
 			filepath.Join(file.DestinationDir, file.Name),
 		)
 		eg, _ := errgroup.WithContext(context.Background())
-		for _, host := range nodes {
-			host := host
+		for i := range nodes {
+			host := nodes[i]
 			eg.Go(func() error {
 				err := k.sshCmdAsync(host, cmdLinkStatic)
 				if err != nil {
diff --git a/lifecycle/pkg/runtime/kubernetes/utils.go b/lifecycle/pkg/runtime/kubernetes/utils.go
@@ -60,8 +60,8 @@ func (k *KubeadmRuntime) sendNewCertAndKey(hosts []string) error {
 
 func (k *KubeadmRuntime) sendFileToHosts(hosts []string, src, dst string) error {
 	eg, _ := errgroup.WithContext(context.Background())
-	for _, node := range hosts {
-		node := node
+	for i := range hosts {
+		node := hosts[i]
 		eg.Go(func() error {
 			if err := k.sshCopy(node, src, dst); err != nil {
 				return fmt.Errorf("send file failed %w", err)

Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,10 @@ func runCommand(cluster *v2.Cluster, targets, args []string) error {`
`88`	`88`	`return err`
`89`	`89`	`}`
`90`	`90`	`eg, _ := errgroup.WithContext(context.Background())`
`91`		`- for _, ipAddr := range targets {`
`92`		`- ipAddr := ipAddr`
	`91`	`+ for i := range targets {`
	`92`	`+ addr := targets[i]`
`93`	`93`	`eg.Go(func() error {`
`94`		`- return execer.CmdAsync(ipAddr, args...)`
	`94`	`+ return execer.CmdAsync(addr, args...)`
`95`	`95`	`})`
`96`	`96`	`}`
`97`	`97`	`return eg.Wait()`
Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,10 @@ func runCopy(cluster *v1beta1.Cluster, targets, args []string) error {`
`72`	`72`	`return err`
`73`	`73`	`}`
`74`	`74`	`eg, _ := errgroup.WithContext(context.Background())`
`75`		`- for _, ipAddr := range targets {`
`76`		`- ipAddr := ipAddr`
	`75`	`+ for i := range targets {`
	`76`	`+ addr := targets[i]`
`77`	`77`	`eg.Go(func() error {`
`78`		`- return execer.Copy(ipAddr, args[0], args[1])`
	`78`	`+ return execer.Copy(addr, args[0], args[1])`
`79`	`79`	`})`
`80`	`80`	`}`
`81`	`81`	`if err = eg.Wait(); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -336,10 +336,10 @@ func (c *Applier) syncWorkdir() {`
`336`	`336`	`logger.Error("failed to create ssh client: %v", err)`
`337`	`337`	`}`
`338`	`338`	`eg, _ := errgroup.WithContext(context.Background())`
`339`		`- for _, ipAddr := range ipList {`
`340`		`- ipAddr := ipAddr`
	`339`	`+ for i := range ipList {`
	`340`	`+ addr := ipList[i]`
`341`	`341`	`eg.Go(func() error {`
`342`		`- return execer.Copy(ipAddr, workDir, workDir)`
	`342`	`+ return execer.Copy(addr, workDir, workDir)`
`343`	`343`	`})`
`344`	`344`	`}`
`345`	`345`	`if err := eg.Wait(); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -988,7 +988,7 @@ func manifestInspect(`
`988`	`988`	`if latestErr == nil {`
`989`	`989`	`latestErr = e`
`990`	`990`	`} else {`
`991`		`- latestErr = fmt.Errorf("tried %v: %w", e, latestErr)`
	`991`	`+ latestErr = errors.Join(fmt.Errorf("tried %w", e), latestErr)`
`992`	`992`	`}`
`993`	`993`	`}`
`994`	`994`