Merge remote-tracking branch 'origin/main' into k0s-1-28-9

Author: laverya

.github/workflows/pull-request.yaml

@@ -204,3 +204,27 @@ jobs:
         license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE }}
         testim-access-token: ${{ secrets.TESTIM_ACCESS_TOKEN }}
         testim-branch: ${{ github.head_ref == 'main' && 'master' || github.head_ref }}
+
+
+  # this job will validate that all the tests passed
+  # it is used for the github branch protection rule
+  validate-success:
+    runs-on: ubuntu-20.04
+    needs:
+      - e2e
+      - sanitize
+      - tests
+    if: always()
+    steps:
+      # https://docs.github.com/en/actions/learn-github-actions/contexts#needs-context
+      - name: fail if e2e job was not successful
+        if: needs.e2e.result != 'success'
+        run: exit 1
+      - name: fail if sanitize job was not successful
+        if: needs.sanitize.result != 'success'
+        run: exit 1
+      - name: fail if tests job was not successful
+        if: needs.tests.result != 'success'
+        run: exit 1
+      - name: succeed if everything else passed
+        run: echo "Validation succeeded"

go.mod

@@ -28,7 +28,7 @@ require (
 	k8s.io/api v0.30.0
 	k8s.io/apimachinery v0.30.0
 	oras.land/oras-go/v2 v2.5.0
-	sigs.k8s.io/controller-runtime v0.18.1
+	sigs.k8s.io/controller-runtime v0.18.2
 	sigs.k8s.io/yaml v1.4.0
 )
 

go.sum

@@ -492,8 +492,8 @@ k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf h1:iTzha1p7Fi83476ypNSz8nV9iR993
 k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c=
 oras.land/oras-go/v2 v2.5.0/go.mod h1:z4eisnLP530vwIOUOJeBIj0aGI0L1C3d53atvCBqZHg=
-sigs.k8s.io/controller-runtime v0.18.1 h1:RpWbigmuiylbxOCLy0tGnq1cU1qWPwNIQzoJk+QeJx4=
-sigs.k8s.io/controller-runtime v0.18.1/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw=
+sigs.k8s.io/controller-runtime v0.18.2 h1:RqVW6Kpeaji67CY5nPEfRz6ZfFMk0lWQlNrLqlNpx+Q=
+sigs.k8s.io/controller-runtime v0.18.2/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

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) {