feat: update adminconsole version (#2165)

* updated adminconsole version

* chore: remove EC18 and old EC version tests

* chore: cleanup files commited by mistake

---------

Co-authored-by: emosbaugh <[email protected]>
Co-authored-by: JGAntunes <[email protected]>

Author: 3 people

.github/workflows/ci.yaml

@@ -492,15 +492,6 @@ jobs:
         run: |
           export SHORT_SHA=dev-${{ needs.git-sha.outputs.git_sha }}
 
-          # re-promote a release containing an old version of embedded-cluster to test upgrades
-          export APP_VERSION="appver-${SHORT_SHA}-pre-minio-removal"
-          replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "${APP_VERSION}"
-
-          # re-promote a release containing an old version of embedded-cluster to test upgrades
-          export APP_VERSION="appver-${SHORT_SHA}-1.8.0-k8s-1.28"
-          replicated release promote 11615 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "${APP_VERSION}"
-          replicated release promote 11615 2eAqMYG1IEtX8cwpaO1kgNV6EB3 --version "${APP_VERSION}"
-
           # promote a release containing the previous stable version of embedded-cluster to test upgrades
           export EC_VERSION="${{ needs.find-previous-stable.outputs.ec_version }}"
           export APP_VERSION="appver-${SHORT_SHA}-previous-stable"
@@ -650,9 +641,7 @@ jobs:
           - TestSingleNodeUpgradePreviousStable
           - TestInstallFromReplicatedApp
           - TestUpgradeFromReplicatedApp
-          - TestUpgradeEC18FromReplicatedApp
           - TestResetAndReinstall
-          # - TestOldVersionUpgrade
           - TestInstallSnapshotFromReplicatedApp
           - TestMultiNodeInstallation
           - TestMultiNodeHAInstallation
@@ -740,9 +729,6 @@ jobs:
           - TestSingleNodeAirgapDisasterRecovery
           - TestMultiNodeAirgapHADisasterRecovery
         include:
-          - test: TestAirgapUpgradeFromEC18
-            runner: embedded-cluster-2
-            is-lxd: true
           - test: TestVersion
             is-lxd: true
           - test: TestCommandsRequireSudo

.github/workflows/release-prod.yaml

@@ -480,9 +480,7 @@ jobs:
           - TestSingleNodeUpgradePreviousStable
           - TestInstallFromReplicatedApp
           - TestUpgradeFromReplicatedApp
-#          - TestUpgradeEC18FromReplicatedApp
           - TestResetAndReinstall
-#          - TestOldVersionUpgrade
           - TestInstallSnapshotFromReplicatedApp
           - TestMultiNodeInstallation
           - TestMultiNodeHAInstallation
@@ -563,9 +561,6 @@ jobs:
           - TestSingleNodeAirgapDisasterRecovery
           - TestMultiNodeAirgapHADisasterRecovery
         include:
-          - test: TestAirgapUpgradeFromEC18
-            runner: embedded-cluster-2
-            is-lxd: true
           - test: TestVersion
             is-lxd: true
           - test: TestCommandsRequireSudo

e2e/install_test.go

@@ -521,154 +521,6 @@ func TestUpgradeFromReplicatedApp(t *testing.T) {
 	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
 }
 
-func TestUpgradeEC18FromReplicatedApp(t *testing.T) {
-	t.Parallel()
-
-	RequireEnvVars(t, []string{"SHORT_SHA"})
-
-	withEnv := map[string]string{"KUBECONFIG": "/var/lib/k0s/pki/admin.conf"}
-
-	tc := docker.NewCluster(&docker.ClusterInput{
-		T:      t,
-		Nodes:  4,
-		Distro: "debian-bookworm",
-		K0sDir: "/var/lib/k0s",
-	})
-	defer tc.Cleanup(withEnv)
-
-	appVer := fmt.Sprintf("appver-%s-1.8.0-k8s-1.28", os.Getenv("SHORT_SHA"))
-
-	downloadECReleaseWithOptions(t, tc, 0, downloadECReleaseOptions{
-		version: appVer,
-	})
-
-	downloadECReleaseWithOptions(t, tc, 1, downloadECReleaseOptions{
-		version: appVer,
-	})
-
-	installSingleNodeWithOptions(t, tc, installOptions{
-		version: appVer,
-		withEnv: withEnv,
-	})
-
-	if err := tc.SetupPlaywright(withEnv); err != nil {
-		t.Fatalf("fail to setup playwright: %v", err)
-	}
-	if stdout, stderr, err := tc.RunPlaywrightTest("deploy-ec18-app"); err != nil {
-		t.Fatalf("fail to run playwright test deploy-ec18-app: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: generating a new worker token command", time.Now().Format(time.RFC3339))
-	stdout, stderr, err := tc.RunPlaywrightTest("get-ec18-join-worker-command")
-	if err != nil {
-		t.Fatalf("fail to generate worker join token:\nstdout: %s\nstderr: %s", stdout, stderr)
-	}
-	command, err := findJoinCommandInOutput(stdout)
-	if err != nil {
-		t.Fatalf("fail to find the join command in the output: %v: %s: %s", err, stdout, stderr)
-	}
-	t.Log("worker join token command:", command)
-
-	t.Logf("%s: joining worker node to the cluster as a worker", time.Now().Format(time.RFC3339))
-	if stdout, stderr, err := tc.RunCommandOnNode(1, strings.Split(command, " ")); err != nil {
-		t.Fatalf("fail to join worker node to the cluster as a worker: %v: %s: %s", err, stdout, stderr)
-	}
-
-	// wait for the nodes to report as ready.
-	t.Logf("%s: all nodes joined, waiting for them to be ready", time.Now().Format(time.RFC3339))
-	stdout, stderr, err = tc.RunCommandOnNode(0, []string{"wait-for-ready-nodes.sh", "2"}, withEnv)
-	if err != nil {
-		t.Fatalf("fail to wait for ready nodes: %v: %s: %s", err, stdout, stderr)
-	}
-
-	checkInstallationStateWithOptions(t, tc, installationStateOptions{
-		version:    appVer,
-		k8sVersion: "v1.28.11",
-		withEnv:    withEnv,
-	})
-
-	appUpgradeVersion := fmt.Sprintf("appver-%s-noop", os.Getenv("SHORT_SHA"))
-	testArgs := []string{appUpgradeVersion}
-
-	t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
-	if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
-		t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: re-installing kots cli on node 0", time.Now().Format(time.RFC3339))
-	line := []string{"install-kots-cli.sh"}
-	if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to install kots cli on node 0: %v: %s: %s", err, stdout, stderr)
-	}
-
-	checkInstallationStateWithOptions(t, tc, installationStateOptions{
-		version: appUpgradeVersion,
-		withEnv: withEnv,
-	})
-
-	// Download embedded-cluster on additional nodes
-	downloadECReleaseWithOptions(t, tc, 2, downloadECReleaseOptions{
-		version: appUpgradeVersion,
-	})
-	downloadECReleaseWithOptions(t, tc, 3, downloadECReleaseOptions{
-		version: appUpgradeVersion,
-	})
-
-	// Join the additional nodes to the cluster
-	joinControllerNode(t, tc, 2)
-	joinWorkerNode(t, tc, 3)
-
-	// wait for all nodes to report as ready
-	waitForNodes(t, tc, 4, withEnv)
-
-	// Check worker profiles for the joined nodes
-	checkWorkerProfile(t, tc, 2)
-	checkWorkerProfile(t, tc, 3)
-
-	appUpgradeVersion = fmt.Sprintf("appver-%s-upgrade", os.Getenv("SHORT_SHA"))
-	testArgs = []string{appUpgradeVersion}
-
-	t.Logf("%s: upgrading cluster a second time", time.Now().Format(time.RFC3339))
-	if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
-		t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
-	}
-
-	checkPostUpgradeStateWithOptions(t, tc, postUpgradeStateOptions{
-		withEnv: withEnv,
-	})
-
-	// wait for all nodes to report as ready after upgrade
-	waitForNodes(t, tc, 4, withEnv)
-
-	// use upgraded binaries to run the reset command
-	// TODO: this is a temporary workaround and should eventually be a feature of EC
-
-	downloadECReleaseWithOptions(t, tc, 0, downloadECReleaseOptions{
-		version: appUpgradeVersion,
-	})
-	downloadECReleaseWithOptions(t, tc, 1, downloadECReleaseOptions{
-		version: appUpgradeVersion,
-	})
-
-	resetInstallationWithOptions(t, tc, 1, resetInstallationOptions{
-		withEnv: withEnv,
-	})
-
-	resetInstallationWithOptions(t, tc, 3, resetInstallationOptions{
-		withEnv: withEnv,
-	})
-
-	resetInstallationWithOptions(t, tc, 2, resetInstallationOptions{
-		withEnv: withEnv,
-	})
-
-	resetInstallationWithOptions(t, tc, 0, resetInstallationOptions{
-		withEnv: withEnv,
-	})
-
-	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
-}
-
 func TestResetAndReinstall(t *testing.T) {
 	t.Parallel()
 
@@ -774,50 +626,6 @@ func TestResetAndReinstallAirgap(t *testing.T) {
 	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
 }
 
-func TestOldVersionUpgrade(t *testing.T) {
-	t.Parallel()
-
-	RequireEnvVars(t, []string{"SHORT_SHA"})
-
-	withEnv := map[string]string{"KUBECONFIG": "/var/lib/k0s/pki/admin.conf"}
-
-	tc := docker.NewCluster(&docker.ClusterInput{
-		T:      t,
-		Nodes:  1,
-		Distro: "debian-bookworm",
-		K0sDir: "/var/lib/k0s",
-	})
-	defer tc.Cleanup(withEnv)
-
-	downloadECReleaseWithOptions(t, tc, 0, downloadECReleaseOptions{
-		version: fmt.Sprintf("appver-%s-pre-minio-removal", os.Getenv("SHORT_SHA")),
-	})
-
-	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 := tc.RunCommandOnNode(0, line, withEnv); err != nil {
-		t.Fatalf("fail to install embedded-cluster on node 0: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: checking installation state", time.Now().Format(time.RFC3339))
-	line = []string{"check-pre-minio-removal-installation-state.sh", fmt.Sprintf("%s-pre-minio-removal", os.Getenv("SHORT_SHA"))}
-	if stdout, stderr, err := tc.RunCommandOnNode(0, line, withEnv); err != nil {
-		t.Fatalf("fail to check installation state: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: running kots upstream upgrade", time.Now().Format(time.RFC3339))
-	line = []string{"kots-upstream-upgrade.sh", os.Getenv("SHORT_SHA")}
-	if stdout, stderr, err := tc.RunCommandOnNode(0, line, withEnv); err != nil {
-		t.Fatalf("fail to run kots upstream upgrade: %v: %s: %s", err, stdout, stderr)
-	}
-
-	checkPostUpgradeStateWithOptions(t, tc, postUpgradeStateOptions{
-		withEnv: withEnv,
-	})
-
-	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
-}
-
 func TestSingleNodeAirgapUpgrade(t *testing.T) {
 	t.Parallel()
 

e2e/playwright/tests/deploy-ec18-app/test.spec.ts

@@ -43,11 +43,6 @@ main() {
         exit 1
     fi
 
-    # if this is the current version in CI
-    if echo "$version" | grep -qvE "(pre-minio-removal|1.8.0-k8s)" ; then
-        validate_data_dirs
-    fi
-
     validate_no_pods_in_crashloop
 }
 

e2e/playwright/tests/get-ec18-join-worker-command/test.spec.ts

@@ -68,11 +68,6 @@ main() {
         exit 1
     fi
 
-    # if this is the current version in CI
-    if echo "$version" | grep -qvE "(pre-minio-removal|1.8.0-k8s)" ; then
-        validate_data_dirs
-    fi
-
     # scale up the second deployment to ensure that images can still be pulled
     echo "scaling up the 'second' deployment to ensure that images can still be pulled"
     kubectl scale -n "$APP_NAMESPACE" deployment/second --replicas=4

e2e/scripts/check-airgap-installation-state.sh

@@ -20,10 +20,6 @@ main() {
     kubectl get pods -A
 
     echo "ensure that installation is installed"
-    if echo "$version" | grep "pre-minio-removal"; then
-        echo "waiting for installation as this is a pre-minio-removal embedded-cluster version (and so the installer doesn't wait for the installation to be ready itself)"
-        wait_for_installation
-    fi
     if ! ensure_installation_is_installed; then
         echo "installation is not installed"
         exit 1
@@ -49,7 +45,7 @@ main() {
     fi
 
     # if this is the current version in CI
-    if echo "$version" | grep -qvE "(pre-minio-removal|1.8.0-k8s|previous-stable)" ; then
+    if echo "$version" | grep -qvE "(previous-stable)" ; then
         validate_data_dirs
     fi
 

e2e/scripts/check-airgap-post-ha-state.sh

@@ -61,11 +61,6 @@ main() {
         exit 1
     fi
 
-    # if this is the current version in CI
-    if echo "$version" | grep -qvE "(pre-minio-removal|1.8.0-k8s)" ; then
-        validate_data_dirs
-    fi
-
     validate_no_pods_in_crashloop
 }