wip: 重新整理 install cmd

internal/controller/installer/installer.prepare.go

@@ -14,10 +14,6 @@ func (i *installer) Prepare(ctx context.Context) error {
 
 	logger.Info("☑️ installer.Prepare: Starting system preparation...")
 
-	if err = i.targetOK(ctx); err != nil {
-		return err
-	}
-
 	// 1. Set timezone to Asia/Shanghai
 	logger.Info("☑️ installer.Prepare: Setting timezone to Asia/Shanghai...")
 	if err = i.setTimezone(ctx); err != nil {
@@ -65,31 +61,23 @@ func (i *installer) Prepare(ctx context.Context) error {
 
 // setTimezone sets the system timezone to Asia/Shanghai
 func (i *installer) setTimezone(ctx context.Context) error {
+	var (
+		err    error
+		output string
+	)
 	// Check if timezone file exists
-	cmd := i.buildCommand(ctx, "test", "-f", "/usr/share/zoneinfo/Asia/Shanghai")
-	if cmd == nil {
-		return fmt.Errorf("failed to build command")
-	}
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("timezone file /usr/share/zoneinfo/Asia/Shanghai not found")
+	if output, err = i.ExecuteCommand(ctx, "test", "-f", "/usr/share/zoneinfo/Asia/Shanghai"); err != nil {
+		return fmt.Errorf("failed to set timezone, err =%s, raw = %s", err.Error(), output)
 	}
 
 	// Remove old localtime link/file
-	cmd = i.buildCommand(ctx, "rm", "-f", "/etc/localtime")
-	if cmd == nil {
-		return fmt.Errorf("failed to build command")
-	}
-	if err := cmd.Run(); err != nil {
-		logger.Debug("Failed to remove /etc/localtime: %v", err)
+	if output, err = i.ExecuteCommand(ctx, "rm", "-f", "/etc/localtime"); err != nil {
+		return fmt.Errorf("failed to set timezone, err =%s, raw = %s", err.Error(), output)
 	}
 
 	// Create symlink
-	cmd = i.buildCommand(ctx, "ln", "-s", "/usr/share/zoneinfo/Asia/Shanghai", "/etc/localtime")
-	if cmd == nil {
-		return fmt.Errorf("failed to build command")
-	}
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to create symlink: %w", err)
+	if output, err = i.ExecuteCommand(ctx, "ln", "-s", "/usr/share/zoneinfo/Asia/Shanghai", "/etc/localtime"); err != nil {
+		return fmt.Errorf("failed to set timezone, err =%s, raw = %s", err.Error(), output)
 	}
 
 	return nil
@@ -97,22 +85,19 @@ func (i *installer) setTimezone(ctx context.Context) error {
 
 // disableSwap disables all swap partitions and removes swap entries from /etc/fstab
 func (i *installer) disableSwap(ctx context.Context) error {
+	var (
+		err    error
+		output string
+	)
+
 	// Turn off all swap
-	cmd := i.buildCommand(ctx, "swapoff", "-a")
-	if cmd == nil {
-		return fmt.Errorf("failed to build command")
-	}
-	if err := cmd.Run(); err != nil {
-		logger.Debug("Failed to swapoff: %v (may be already off)", err)
+	if output, err = i.ExecuteCommand(ctx, "swapoff", "-a"); err != nil {
+		logger.Debug("Failed to swapoff: %v (may be already off), raw = %s", err, output)
 	}
 
 	// Comment out swap entries in /etc/fstab to make it persistent
-	cmd = i.buildCommand(ctx, "sed", "-i", "/swap/s/^/#/", "/etc/fstab")
-	if cmd == nil {
-		return fmt.Errorf("failed to build command")
-	}
-	if err := cmd.Run(); err != nil {
-		logger.Debug("Failed to comment swap in /etc/fstab: %v", err)
+	if output, err = i.ExecuteCommand(ctx, "sed", "-i", "/swap/s/^/#/", "/etc/fstab"); err != nil {
+		logger.Debug("Failed to comment swap in /etc/fstab: %v, raw = %s", err, output)
 	}
 
 	return nil
@@ -120,23 +105,21 @@ func (i *installer) disableSwap(ctx context.Context) error {
 
 // loadKernelModule loads a kernel module and ensures it's loaded on boot
 func (i *installer) loadKernelModule(ctx context.Context, moduleName string) error {
+	var (
+		err    error
+		output string
+	)
+
 	// Load the module immediately
-	cmd := i.buildCommand(ctx, "modprobe", moduleName)
-	if cmd == nil {
-		return fmt.Errorf("failed to build command")
-	}
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to load module %s: %w", moduleName, err)
+	if output, err = i.ExecuteCommand(ctx, "modprobe", moduleName); err != nil {
+		return fmt.Errorf("failed to load module %s: %w, raw = %s", moduleName, err, output)
 	}
 
 	// Add to /etc/modules-load.d/ to load on boot
 	filePath := fmt.Sprintf("/etc/modules-load.d/%s.conf", moduleName)
-	cmd = i.buildCommand(ctx, "bash", "-c", fmt.Sprintf("echo '%s' > %s", moduleName, filePath))
-	if cmd == nil {
-		return fmt.Errorf("failed to build command")
-	}
-	if err := cmd.Run(); err != nil {
-		logger.Debug("Failed to add module to modules-load.d: %v", err)
+	command := fmt.Sprintf("echo '%s' > %s", moduleName, filePath)
+	if output, err = i.ExecuteCommand(ctx, "bash", "-c", command); err != nil {
+		logger.Debug("Failed to add module to modules-load.d: %v, raw = %s", err, output)
 	}
 
 	return nil
@@ -144,6 +127,11 @@ func (i *installer) loadKernelModule(ctx context.Context, moduleName string) err
 
 // applySysctlSettings applies required sysctl settings for Kubernetes
 func (i *installer) applySysctlSettings(ctx context.Context) error {
+	var (
+		err    error
+		output string
+	)
+
 	const sysctlConfig = `# Kubernetes required settings
 net.bridge.bridge-nf-call-iptables = 1
 net.bridge.bridge-nf-call-ip6tables = 1
@@ -163,21 +151,14 @@ net.ipv4.neigh.default.gc_thresh3 = 8192
 `
 
 	// Write sysctl config file
-	cmd := i.buildCommand(ctx, "bash", "-c", fmt.Sprintf("cat > /etc/sysctl.d/99-kubernetes.conf << 'EOF'\n%sEOF", sysctlConfig))
-	if cmd == nil {
-		return fmt.Errorf("failed to build command")
-	}
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to write sysctl config: %w", err)
+	command := fmt.Sprintf("cat > /etc/sysctl.d/99-kubernetes.conf << 'EOF'\n%sEOF", sysctlConfig)
+	if output, err = i.ExecuteCommand(ctx, "bash", "-c", command); err != nil {
+		return fmt.Errorf("failed to write sysctl config: %w, raw = %s", err, output)
 	}
 
 	// Apply sysctl settings
-	cmd = i.buildCommand(ctx, "sysctl", "--system")
-	if cmd == nil {
-		return fmt.Errorf("failed to build command")
-	}
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to apply sysctl settings: %w", err)
+	if output, err = i.ExecuteCommand(ctx, "sysctl", "--system"); err != nil {
+		return fmt.Errorf("failed to apply sysctl settings: %w, raw = %s", err, output)
 	}
 
 	return nil