deploy admin console without minio (#431)

Author: cbodonnell

.github/workflows/pull-request.yaml

@@ -1,6 +1,9 @@
 name: Pull request
 on:
 - pull_request
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 jobs:
   sanitize:
     name: Sanitize
@@ -71,6 +74,9 @@ jobs:
         sed -i "s/__version_string__/${SHORT_SHA}/g" e2e/kots-release-install/cluster-config.yaml
         sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
 
+        # re-promote a release containing an old version of embedded-cluster to test upgrades
+        replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "${SHORT_SHA}-pre-minio-removal"
+
         replicated release create --yaml-dir e2e/kots-release-install --promote CI --version "${SHORT_SHA}"
         replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "${SHORT_SHA}-upgrade"
     - name: Build CI binary
@@ -125,6 +131,7 @@ jobs:
           - TestInstallWithoutEmbed
           - TestResetAndReinstall
           - TestCollectSupportBundle
+          - TestOldVersionUpgrade
     steps:
     - name: Checkout
       uses: actions/checkout@v4

.github/workflows/release-dev.yaml

@@ -106,6 +106,7 @@ jobs:
           - TestInstallFromReplicatedApp
           - TestResetAndReinstall
           - TestCollectSupportBundle
+          - TestOldVersionUpgrade
     steps:
       - name: Checkout
         uses: actions/checkout@v4

Makefile

@@ -4,7 +4,7 @@ ARCH := $(shell uname -m)
 APP_NAME = embedded-cluster
 ADMIN_CONSOLE_CHART_URL = oci://registry.replicated.com/library
 ADMIN_CONSOLE_CHART_NAME = admin-console
-ADMIN_CONSOLE_CHART_VERSION = 1.108.0
+ADMIN_CONSOLE_CHART_VERSION = 1.108.0-build.1
 ADMIN_CONSOLE_IMAGE_OVERRIDE =
 ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
 EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library

e2e/install_test.go

@@ -2,6 +2,7 @@ package e2e
 
 import (
 	"encoding/json"
+	"fmt"
 	"os"
 	"strings"
 	"testing"
@@ -452,6 +453,51 @@ func TestResetAndReinstall(t *testing.T) {
 	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
 }
 
+func TestOldVersionUpgrade(t *testing.T) {
+	t.Parallel()
+	tc := cluster.NewTestCluster(&cluster.Input{
+		T:     t,
+		Nodes: 1,
+		Image: "ubuntu/jammy",
+	})
+	defer tc.Destroy()
+	t.Logf("%s: downloading embedded-cluster on node 0", time.Now().Format(time.RFC3339))
+	line := []string{"vandoor-prepare.sh", fmt.Sprintf("%s-pre-minio-removal", os.Getenv("SHORT_SHA")), os.Getenv("LICENSE_ID")}
+	if stdout, stderr, err := RunCommandOnNode(t, tc, 0, line); err != nil {
+		t.Log("stdout:", stdout)
+		t.Log("stderr:", stderr)
+		t.Fatalf("fail to download embedded-cluster on node 0 %s: %v", tc.Nodes[0], err)
+	}
+
+	t.Logf("%s: installing embedded-cluster on node 0", time.Now().Format(time.RFC3339))
+	line = []string{"pre-minio-removal-install.sh", "cli"}
+	if stdout, stderr, err := RunCommandOnNode(t, tc, 0, line); err != nil {
+		t.Log("install stdout:", stdout)
+		t.Log("install 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", fmt.Sprintf("%s-pre-minio-removal", os.Getenv("SHORT_SHA"))}
+	stdout, stderr, err := RunCommandOnNode(t, tc, 0, line)
+	if err != nil {
+		t.Log("stdout:", stdout)
+		t.Log("stderr:", stderr)
+		t.Fatalf("fail to check installation state: %v", err)
+	}
+
+	t.Logf("%s: checking installation state after upgrade", time.Now().Format(time.RFC3339))
+	line = []string{"check-postupgrade-state.sh", os.Getenv("SHORT_SHA")}
+	stdout, stderr, err = RunCommandOnNode(t, tc, 0, line)
+	if err != nil {
+		t.Log("stdout:", stdout)
+		t.Log("stderr:", stderr)
+		t.Fatalf("fail to check postupgrade state: %v", err)
+	}
+
+	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
+}
+
 func runPuppeteerAppStatusCheck(t *testing.T, node int, tc *cluster.Output) {
 	t.Logf("%s: installing puppeteer on node %d", time.Now().Format(time.RFC3339), node)
 	line := []string{"install-puppeteer.sh"}

e2e/scripts/check-installation-state.sh

@@ -50,7 +50,7 @@ ensure_app_deployed() {
 
     kubectl kots get versions -n kotsadm embedded-cluster-smoke-test-staging-app
     if ! kubectl kots get versions -n kotsadm embedded-cluster-smoke-test-staging-app | grep -q "${version}\W*[01]\W*deployed"; then
-        echo "application not deployed"
+        echo "application version ${version} not deployed"
         return 1
     fi
 }

e2e/scripts/check-postupgrade-state.sh

@@ -5,7 +5,7 @@ wait_for_installation() {
     ready=$(kubectl get installations --no-headers | grep -c "Installed" || true)
     counter=0
     while [ "$ready" -lt "1" ]; do
-        if [ "$counter" -gt 36 ]; then
+        if [ "$counter" -gt 84 ]; then
             echo "installation did not become ready"
             kubectl get installations 2>&1 || true
             kubectl describe installations 2>&1 || true
@@ -95,6 +95,16 @@ main() {
     echo "ensure that the admin console branding is available"
     kubectl get cm -n kotsadm kotsadm-application-metadata
 
+    echo "ensure that the kotsadm statefulset exists"
+    kubectl get statefulset -n kotsadm kotsadm
+
+    echo "ensure the kotsadm-minio statefulset does not exist"
+    if kubectl get statefulset -n kotsadm kotsadm-minio; then
+        echo "kotsadm-minio statefulset found"
+        kubectl get statefulset -n kotsadm kotsadm-minio
+        exit 1
+    fi
+
     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