remove embedded-cluster from additional components installation output (#590)

* remove embedded-cluster from additional components installation output

* log like 'Waiting for additional components to be ready (%d/%d)'

* the right chart...

* no negatives

* finalizing (Admin Console/additional components)

* simplify

Author: laverya

pkg/kotscli/kotscli.go

@@ -134,7 +134,7 @@ func MaskKotsOutputForOnline() spinner.MaskFn {
 		if strings.Contains(message, "Finished") {
 			return message
 		}
-		return "Finalizing"
+		return "Finalizing Admin Console"
 	}
 }
 
@@ -150,7 +150,7 @@ func MaskKotsOutputForAirgap() spinner.MaskFn {
 		case strings.Contains(message, "Pushing embedded cluster artifacts"):
 			current = message
 		case strings.Contains(message, "Waiting for Admin Console"):
-			current = "Finalizing"
+			current = "Finalizing Admin Console"
 		case strings.Contains(message, "Finished!"):
 			current = message
 		}

pkg/kubeutils/kubeutils.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"sort"
-	"strings"
 	"time"
 
 	embeddedclusterv1beta1 "github.com/replicatedhq/embedded-cluster-kinds/apis/v1beta1"
@@ -131,7 +130,7 @@ func WaitForInstallation(ctx context.Context, cli client.Client, writer *spinner
 			lastInstall := installs[0]
 
 			if writer != nil {
-				writeStatusMessage(writer, lastInstall.Status)
+				writeStatusMessage(writer, lastInstall)
 			}
 
 			// check the status of the installation
@@ -148,27 +147,34 @@ func WaitForInstallation(ctx context.Context, cli client.Client, writer *spinner
 	return nil
 }
 
-func writeStatusMessage(writer *spinner.MessageWriter, status embeddedclusterv1beta1.InstallationStatus) {
-	if status.State != embeddedclusterv1beta1.InstallationStatePendingChartCreation {
-		writer.Infof("Waiting for additional components to be ready: %s", status.Reason)
+func writeStatusMessage(writer *spinner.MessageWriter, install embeddedclusterv1beta1.Installation) {
+	if install.Status.State != embeddedclusterv1beta1.InstallationStatePendingChartCreation {
 		return
 	}
 
-	chartNames := ""
-	if len(status.PendingCharts) == 0 {
+	if install.Spec.Config == nil || install.Spec.Config.Extensions.Helm == nil {
 		return
-	} else if len(status.PendingCharts) == 1 {
-		// A
-		chartNames = status.PendingCharts[0]
-	} else if len(status.PendingCharts) == 2 {
-		// A and B
-		chartNames = strings.Join(status.PendingCharts, " and ")
-	} else {
-		// A, B, and C
-		chartNames = strings.Join(status.PendingCharts[:len(status.PendingCharts)-1], ", ") + " and " + status.PendingCharts[len(status.PendingCharts)-1]
+	}
+	numDesiredCharts := len(install.Spec.Config.Extensions.Helm.Charts)
+
+	pendingChartsMap := map[string]struct{}{}
+	for _, chartName := range install.Status.PendingCharts {
+		pendingChartsMap[chartName] = struct{}{}
 	}
 
-	writer.Infof("Waiting for additional components %s to be ready", chartNames)
+	numPendingCharts := 0
+	for _, ch := range install.Spec.Config.Extensions.Helm.Charts {
+		if _, ok := pendingChartsMap[ch.Name]; ok {
+			numPendingCharts++
+		}
+	}
+	numCompletedCharts := numDesiredCharts - numPendingCharts
+
+	if numCompletedCharts < numDesiredCharts {
+		writer.Infof("Waiting for additional components to be ready (%d/%d)", numCompletedCharts, numDesiredCharts)
+	} else {
+		writer.Infof("Finalizing additional components")
+	}
 }
 
 func IsNamespaceReady(ctx context.Context, cli client.Client, ns string) (bool, error) {