f

Author: sgalsaleh

cmd/installer/cli/install.go

@@ -250,8 +250,11 @@ func preRunInstall(cmd *cobra.Command, flags *InstallCmdFlags) error {
 
 	flags.isAirgap = flags.airgapBundle != ""
 
-	if err := ensureAdminConsolePassword(flags); err != nil {
-		return err
+	// restore command doesn't have a password flag
+	if cmd.Flags().Lookup("admin-console-password") != nil {
+		if err := ensureAdminConsolePassword(flags); err != nil {
+			return err
+		}
 	}
 
 	if flags.guidedUI {
@@ -449,11 +452,88 @@ func waitForInstallAPI(ctx context.Context, addr string) error {
 	}
 }
 
+func newAPIClient(flags InstallCmdFlags) (apiclient.Client, error) {
+	apiClient := apiclient.New(fmt.Sprintf("http://localhost:%d", flags.managerPort))
+	if err := apiClient.Login(flags.adminConsolePassword); err != nil {
+		return nil, fmt.Errorf("unable to login to api: %w", err)
+	}
+	return apiClient, nil
+}
+
+func setupStatusUpdates(ctx context.Context, flags InstallCmdFlags, successChan <-chan struct{}) (chan spinner.GlobalMessage, error) {
+	if !flags.guidedUI {
+		return nil, nil
+	}
+
+	statusChan := make(chan spinner.GlobalMessage)
+	spinner.SetGlobalChannel(statusChan)
+
+	apiClient, err := newAPIClient(flags)
+	if err != nil {
+		return nil, fmt.Errorf("unable to create api client: %w", err)
+	}
+
+	// start a goroutine to handle status updates
+	go func(apiClient apiclient.Client) {
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case <-successChan:
+				status := apitypes.InstallationStatus{
+					State:       apitypes.InstallationStateSucceeded,
+					Description: "Install Complete",
+					LastUpdated: time.Now(),
+				}
+				if _, err := apiClient.SetInstallStatus(status); err != nil {
+					logrus.Errorf("Unable to update installation status: %v", err)
+				}
+				return
+			case msg := <-statusChan:
+				status := apitypes.InstallationStatus{
+					State:       apitypes.InstallationStateRunning,
+					Description: msg.Message,
+					LastUpdated: time.Now(),
+				}
+				if msg.Err {
+					status.State = apitypes.InstallationStateFailed
+				}
+				if _, err := apiClient.SetInstallStatus(status); err != nil {
+					logrus.Errorf("Unable to update installation status: %v", err)
+				}
+			}
+		}
+	}(apiClient)
+
+	return statusChan, nil
+}
+
+func markUIInstallComplete(statusChan chan spinner.GlobalMessage) {
+	// Send final success message before closing
+	statusChan <- spinner.GlobalMessage{
+		Message: "Install Complete",
+		Err:     false,
+	}
+	close(statusChan)
+}
+
 func runInstall(ctx context.Context, name string, flags InstallCmdFlags, metricsReporter preflights.MetricsReporter) error {
 	if err := runInstallVerifyAndPrompt(ctx, name, &flags); err != nil {
 		return err
 	}
 
+	apiClient, err := newAPIClient(flags)
+	if err != nil {
+		return fmt.Errorf("unable to create api client: %w", err)
+	}
+
+	// set up status update channel for guided UI mode
+	statusChan, err := setupStatusUpdates(flags, apiClient)
+	if err != nil {
+		return fmt.Errorf("unable to setup status updates: %w", err)
+	}
+	defer close(statusChan)
+
 	logrus.Debug("initializing install")
 	if err := initializeInstall(ctx, flags); err != nil {
 		return fmt.Errorf("unable to initialize install: %w", err)
@@ -571,9 +651,7 @@ func runInstall(ctx context.Context, name string, flags InstallCmdFlags, metrics
 	}
 
 	if flags.guidedUI {
-		if err := markUIInstallComplete(flags.adminConsolePassword, flags.managerPort); err != nil {
-			return fmt.Errorf("unable to mark ui install complete: %w", err)
-		}
+		markUIInstallComplete(statusChan)
 	} else {
 		if err := printSuccessMessage(flags.license, flags.networkInterface); err != nil {
 			return err
@@ -583,22 +661,6 @@ func runInstall(ctx context.Context, name string, flags InstallCmdFlags, metrics
 	return nil
 }
 
-func markUIInstallComplete(password string, managerPort int) error {
-	apiClient := apiclient.New(fmt.Sprintf("http://localhost:%d", managerPort))
-	if err := apiClient.Login(password); err != nil {
-		return fmt.Errorf("unable to login: %w", err)
-	}
-	_, err := apiClient.SetInstallStatus(apitypes.InstallationStatus{
-		State:       apitypes.InstallationStateSucceeded,
-		Description: "Install Complete",
-		LastUpdated: time.Now(),
-	})
-	if err != nil {
-		return fmt.Errorf("unable to set install status: %w", err)
-	}
-	return nil
-}
-
 func runInstallVerifyAndPrompt(ctx context.Context, name string, flags *InstallCmdFlags) error {
 	logrus.Debugf("checking if k0s is already installed")
 	err := verifyNoInstallation(name, "reinstall")