Fix sorting Helm charts with double digit order numbers (#402)

Author: sgalsaleh

Makefile

@@ -9,7 +9,7 @@ ADMIN_CONSOLE_IMAGE_OVERRIDE =
 ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
 EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
 EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator
-EMBEDDED_OPERATOR_CHART_VERSION = 0.23.0
+EMBEDDED_OPERATOR_CHART_VERSION = 0.23.1
 OPENEBS_CHART_URL = https://openebs.github.io/charts
 OPENEBS_CHART_NAME = openebs/openebs
 OPENEBS_CHART_VERSION = 3.10.0

e2e/install_test.go

@@ -31,15 +31,16 @@ func TestSingleNodeInstallation(t *testing.T) {
 	defer tc.Destroy()
 	t.Logf("%s: installing embedded-cluster on node 0", time.Now().Format(time.RFC3339))
 	line := []string{"single-node-install.sh"}
-	if stdout, stderr, err := RunCommandOnNode(t, tc, 0, line); err != nil {
-		t.Log("install stdout:", stdout)
-		t.Log("install stderr:", stderr)
+	stdout, stderr, err := RunCommandOnNode(t, tc, 0, line)
+	if err != nil {
+		t.Log("stdout:", stdout)
+		t.Log("stderr:", stderr)
 		t.Fatalf("fail to install embedded-cluster on node %s: %v", tc.Nodes[0], err)
 	}
 
 	t.Logf("%s: checking installation state", time.Now().Format(time.RFC3339))
 	line = []string{"check-installation-state.sh"}
-	stdout, stderr, err := RunCommandOnNode(t, tc, 0, line)
+	stdout, stderr, err = RunCommandOnNode(t, tc, 0, line)
 	if err != nil {
 		t.Log("stdout:", stdout)
 		t.Log("stderr:", stderr)
@@ -72,13 +73,16 @@ func TestSingleNodeInstallationRockyLinux8(t *testing.T) {
 	defer tc.Destroy()
 	t.Logf("%s: installing embedded-cluster on node 0", time.Now().Format(time.RFC3339))
 	line := []string{"single-node-install.sh"}
-	if _, _, err := RunCommandOnNode(t, tc, 0, line); err != nil {
+	stdout, stderr, err := RunCommandOnNode(t, tc, 0, line)
+	if err != nil {
+		t.Log("stdout:", stdout)
+		t.Log("stderr:", stderr)
 		t.Fatalf("fail to install embedded-cluster on node %s: %v", tc.Nodes[0], err)
 	}
 
 	t.Logf("%s: checking installation state", time.Now().Format(time.RFC3339))
 	line = []string{"check-installation-state.sh"}
-	stdout, stderr, err := RunCommandOnNode(t, tc, 0, line)
+	stdout, stderr, err = RunCommandOnNode(t, tc, 0, line)
 	if err != nil {
 		t.Log("stdout:", stdout)
 		t.Log("stderr:", stderr)
@@ -129,13 +133,16 @@ func TestSingleNodeInstallationDebian12(t *testing.T) {
 
 	t.Logf("%s: installing embedded-cluster on node 0", time.Now().Format(time.RFC3339))
 	line := []string{"single-node-install.sh"}
-	if _, _, err := RunCommandOnNode(t, tc, 0, line); err != nil {
+	stdout, stderr, err := RunCommandOnNode(t, tc, 0, line)
+	if err != nil {
+		t.Log("stdout:", stdout)
+		t.Log("stderr:", stderr)
 		t.Fatalf("fail to install embedded-cluster on node %s: %v", tc.Nodes[0], err)
 	}
 
 	t.Logf("%s: checking installation state", time.Now().Format(time.RFC3339))
 	line = []string{"check-installation-state.sh"}
-	stdout, stderr, err := RunCommandOnNode(t, tc, 0, line)
+	stdout, stderr, err = RunCommandOnNode(t, tc, 0, line)
 	if err != nil {
 		t.Log("stdout:", stdout)
 		t.Log("stderr:", stderr)
@@ -166,13 +173,16 @@ func TestSingleNodeInstallationCentos8Stream(t *testing.T) {
 	defer tc.Destroy()
 	t.Logf("%s: installing embedded-cluster on node 0", time.Now().Format(time.RFC3339))
 	line := []string{"single-node-install.sh"}
-	if _, _, err := RunCommandOnNode(t, tc, 0, line); err != nil {
+	stdout, stderr, err := RunCommandOnNode(t, tc, 0, line)
+	if err != nil {
+		t.Log("stdout:", stdout)
+		t.Log("stderr:", stderr)
 		t.Fatalf("fail to install embedded-cluster on node %s: %v", tc.Nodes[0], err)
 	}
 
 	t.Logf("%s: checking installation state", time.Now().Format(time.RFC3339))
 	line = []string{"check-installation-state.sh"}
-	stdout, stderr, err := RunCommandOnNode(t, tc, 0, line)
+	stdout, stderr, err = RunCommandOnNode(t, tc, 0, line)
 	if err != nil {
 		t.Log("stdout:", stdout)
 		t.Log("stderr:", stderr)

e2e/scripts/check-postupgrade-state.sh

@@ -91,10 +91,10 @@ main() {
     echo "ensure that the admin console branding is available"
     kubectl get cm -n kotsadm kotsadm-application-metadata
 
-    echo "ensure that the default chart order remained 10"
-    if ! kubectl describe clusterconfig -n kube-system k0s | grep -q -e 'Order:\W*10' ; then
+    echo "ensure that the default chart order remained 110"
+    if ! kubectl describe clusterconfig -n kube-system k0s | grep -q -e 'Order:\W*110' ; then
         kubectl describe clusterconfig -n kube-system k0s
-        echo "no charts had an order of '10'"
+        echo "no charts had an order of '110'"
         exit 1
     fi
 }

e2e/scripts/single-node-install.sh

@@ -113,12 +113,29 @@ ensure_app_not_upgraded() {
         echo "found goldpinger ns"
         return 1
     fi
-    if kubectl get pods -n kotsadm -l app=second -q | grep -q second ; then
+    if kubectl get pods -n kotsadm -l app=second | grep -q second ; then
         echo "found pods from app update"
         return 1
     fi
 }
 
+check_pod_install_order() {
+    local ingress_install_time=
+    ingress_install_time=$(kubectl get pods --no-headers=true -n ingress-nginx -o jsonpath='{.items[*].metadata.creationTimestamp}' | sort | head -n 1)
+
+
+    local openebs_install_time=
+    openebs_install_time=$(kubectl get pods --no-headers=true -n openebs -o jsonpath='{.items[*].metadata.creationTimestamp}' | sort | head -n 1)
+
+    echo "ingress_install_time: $ingress_install_time"
+    echo "openebs_install_time: $openebs_install_time"
+
+    if [[ "$ingress_install_time" < "$openebs_install_time" ]]; then
+        echo "Ingress pods were installed before openebs pods"
+        return 1
+    fi
+}
+
 main() {
     if embedded-cluster install --no-prompt 2>&1 | tee /tmp/log ; then
         echo "Expected installation to fail without a license provided"
@@ -161,6 +178,9 @@ main() {
     if ! ensure_app_not_upgraded; then
         exit 1
     fi
+    if ! check_pod_install_order; then
+        exit 1
+    fi
     if ! systemctl status embedded-cluster; then
         echo "Failed to get status of embedded-cluster service"
         exit 1

pkg/config/config.go

@@ -64,6 +64,12 @@ func UpdateHelmConfigs(cfg *k0sconfig.ClusterConfig, opts ...addons.Option) erro
 	if err != nil {
 		return fmt.Errorf("unable to apply addons: %w", err)
 	}
+	// k0s sorts order numbers alphabetically because they're used in file names,
+	// which means double digits can be sorted before single digits (e.g. "10" comes before "5").
+	// We add 100 to the order of each chart to work around this.
+	for k := range chtconfig {
+		chtconfig[k].Order += 100
+	}
 	cfg.Spec.Extensions = &k0sconfig.ClusterExtensions{
 		Helm: &k0sconfig.HelmExtensions{
 			Charts:       chtconfig,