chore(test): fixes and workflow updates

Author: adriankabala

.github/workflows/e2e.yaml

@@ -30,6 +30,7 @@ jobs:
         - "**.go"
         - "!**_test.go" # exclude test files to ignore unit test changes
         - "test/**" # include test files in e2e again
+        - "e2e-next/**" #include e2e-next tests
         - "!**.md"
         - "Dockerfile.release"
         - ".github/workflows/e2e.yaml"

e2e-next/constants/cluster.go

@@ -1,14 +1,14 @@
 package constants
 
-var vclusterCluster string
+var hostCluster string
 
-func GetClusterName() string {
-	if vclusterCluster == "" {
+func GetHostClusterName() string {
+	if hostCluster == "" {
 		return "kind-cluster"
 	}
-	return vclusterCluster
+	return hostCluster
 }
 
-func SetClusterName(name string) {
-	vclusterCluster = name
+func SetHostClusterName(name string) {
+	hostCluster = name
 }

e2e-next/constants/image.go

@@ -4,18 +4,14 @@ import (
 	"strings"
 )
 
-const (
-	DefaultVclusterImage = "ghcr.io/loft-sh/vcluster:0.30.0"
-)
-
 var (
 	repository string
 	tag        string
 )
 
-func GetImage() string {
+func GetVclusterImage() string {
 	if repository == "" && tag == "" {
-		return DefaultVclusterImage
+		return "ghcr.io/loft-sh/vcluster:dev-next"
 	}
 	if tag == "" {
 		return repository
@@ -37,7 +33,7 @@ func GetTag() string {
 	return tag
 }
 
-func SetImage(image string) {
+func SetVclusterImage(image string) {
 	if strings.Contains(image, "@") {
 		// Handle digest format: repo@sha256:xxx
 		parts := strings.SplitN(image, "@", 2)

e2e-next/e2e_suite_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/loft-sh/e2e-framework/pkg/e2e"
 	cluster "github.com/loft-sh/e2e-framework/pkg/setup/cluster"
-	"github.com/loft-sh/e2e-framework/pkg/setup/devspace"
 	"github.com/peterbourgon/ff/v3"
 
 	"github.com/loft-sh/vcluster/e2e-next/constants"
@@ -34,8 +33,8 @@ var (
 
 // Register your flags in an init function.  This ensures they are registered _before_ `go test` calls flag.Parse().
 func handleFlags() {
-	flag.StringVar(&vclusterImage, "vcluster-image", constants.DefaultVclusterImage, "vCluster image to test")
-	flag.StringVar(&clusterName, "cluster-name", constants.GetClusterName(), "The kind cluster to run test against. Optional.")
+	flag.StringVar(&vclusterImage, "vcluster-image", constants.GetVclusterImage(), "vCluster image to test")
+	flag.StringVar(&clusterName, "cluster-name", constants.GetHostClusterName(), "The kind cluster to run test against. Optional.")
 	flag.BoolVar(&setupOnly, "setup-only", false, "Skip tests and setup the environment")
 	flag.BoolVar(&teardown, "teardown", true, "Disables [e2e.AfterSuite] [e2e.AfterAll] to leave environment in place.")
 	flag.BoolVar(&teardownOnly, "teardown-only", false, "Skip tests and tear down the environment")
@@ -47,8 +46,8 @@ func handleFlags() {
 		panic(err)
 	}
 
-	constants.SetClusterName(clusterName)
-	constants.SetImage(vclusterImage)
+	constants.SetHostClusterName(clusterName)
+	constants.SetVclusterImage(vclusterImage)
 
 	e2e.SetSetupOnly(setupOnly)
 	e2e.SetTeardown(!setupOnly && teardown)
@@ -76,10 +75,10 @@ var _ = BeforeSuite(func(ctx context.Context) context.Context {
 
 	By("Creating kind cluster " + clusterName)
 	clusterOptions := []cluster.Options{
-		cluster.WithName(constants.GetClusterName()),
+		cluster.WithName(constants.GetHostClusterName()),
 		cluster.WithProvider(kind.NewProvider()),
 	}
-	if constants.GetClusterName() == "kind-cluster" {
+	if constants.GetHostClusterName() == "kind-cluster" {
 		clusterOptions = append(clusterOptions, cluster.WithConfigFile("e2e-kind.config.yaml"))
 	}
 
@@ -97,23 +96,14 @@ var _ = BeforeSuite(func(ctx context.Context) context.Context {
 	ctx, err = cluster.UseCluster(clusterName)(ctx)
 	Expect(err).NotTo(HaveOccurred())
 
-	if vclusterImage == "" {
-		By("No vcluster image specified, using default")
-		vclusterImage = constants.DefaultVclusterImage
-	}
-	if devspace.From(ctx) {
-		By("Using DevSpace built image, skip loading image to kind cluster...")
-	} else if vclusterImage != constants.DefaultVclusterImage {
-		By("Loading image to kind cluster...")
-		ctx, err = cluster.LoadImage(clusterName, vclusterImage)(ctx)
-		Expect(err).NotTo(HaveOccurred())
-	} else {
-		By("Using stable image...")
-	}
+	By("Loading image to kind cluster...")
+	ctx, err = cluster.LoadImage(clusterName, vclusterImage)(ctx)
+	Expect(err).NotTo(HaveOccurred())
+
 	return ctx
 })
 
 var _ = AfterSuite(func(ctx context.Context) {
-	_, err := cluster.Destroy(constants.GetClusterName())(ctx)
+	_, err := cluster.Destroy(constants.GetHostClusterName())(ctx)
 	Expect(err).NotTo(HaveOccurred())
 })

e2e-next/test_core/sync/test_node.go

@@ -49,7 +49,7 @@ var _ = Describe("Node sync",
 
 		It("Sync nodes using label selector", func(ctx context.Context) {
 
-			hostname := constants.GetClusterName() + "-control-plane"
+			hostname := constants.GetHostClusterName() + "-control-plane"
 			if kindName, ok := os.LookupEnv("KIND_NAME"); ok && kindName != "" {
 				hostname = kindName + "-control-plane"
 			}

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/loft-sh/agentapi/v4 v4.5.0-alpha.10
 	github.com/loft-sh/analytics-client v0.0.0-20240219162240-2f4c64b2494e
 	github.com/loft-sh/api/v4 v4.5.0-alpha.10
-	github.com/loft-sh/e2e-framework v0.0.0-20251106141448-bb8544c0c016
+	github.com/loft-sh/e2e-framework v0.0.0-20251118151008-0a6143fe4ef5
 	github.com/loft-sh/image v0.0.0-20250625154753-87447a6ad364
 	github.com/loft-sh/utils v0.0.29
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d

go.sum

@@ -313,6 +313,8 @@ github.com/loft-sh/e2e-framework v0.0.0-20251106021254-afe4626e9c36 h1:ikPWcAwxU
 github.com/loft-sh/e2e-framework v0.0.0-20251106021254-afe4626e9c36/go.mod h1:b4tZYkj8EobUU7RtUTHT7ih+eir/dpfVn6RYlkUks50=
 github.com/loft-sh/e2e-framework v0.0.0-20251106141448-bb8544c0c016 h1:3C27LFDtbo1MaAk/V8yr6J70oBgHXkoj2L31vW9/8xs=
 github.com/loft-sh/e2e-framework v0.0.0-20251106141448-bb8544c0c016/go.mod h1:b4tZYkj8EobUU7RtUTHT7ih+eir/dpfVn6RYlkUks50=
+github.com/loft-sh/e2e-framework v0.0.0-20251118151008-0a6143fe4ef5 h1:gY6w+pT85VPPUsjap9t5WscKBG63ZD4rADSD91QqAKM=
+github.com/loft-sh/e2e-framework v0.0.0-20251118151008-0a6143fe4ef5/go.mod h1:b4tZYkj8EobUU7RtUTHT7ih+eir/dpfVn6RYlkUks50=
 github.com/loft-sh/image v0.0.0-20250625154753-87447a6ad364 h1:vSuqHqh4w2zrG+WvnyH64JAUhX+Bou19n0gvCrPirOs=
 github.com/loft-sh/image v0.0.0-20250625154753-87447a6ad364/go.mod h1:niVPRwWFUSA8FihY9e5hGAp5IbKmbCdckGxJGSTKTUs=
 github.com/loft-sh/log v0.0.0-20240219160058-26d83ffb46ac h1:Gz/7Lb7WgdgIv+KJz87ORA1zvQW52tUqKPGyunlp4dQ=