test(e2e): use cluster count, add image patch

Author: aleoli

test/e2e/cruise/apiserverinteraction/apiserver_interaction_test.go

@@ -99,7 +99,7 @@ var _ = Describe("Liqo E2E", func() {
 
 			By("Ensuring virtual nodes are ready")
 			Eventually(func() bool {
-				return util.CheckVirtualNodes(ctx, testContext.Clusters[0].NativeClient, clustersRequired)
+				return util.CheckVirtualNodes(ctx, testContext.Clusters[0].NativeClient, testContext.ClustersNumber)
 			}, timeout, interval).Should(BeTrue())
 
 			Expect(util.OffloadNamespace(testContext.Clusters[0].KubeconfigPath, namespaceName,

test/e2e/testutils/apiserver/create.go

@@ -19,6 +19,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -61,7 +62,7 @@ func CreateKubectlJob(ctx context.Context, cl client.Client, namespace string, v
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{{
 						Name:      containerName,
-						Image:     fmt.Sprintf("%s:%s.%s", image, v.Major, v.Minor),
+						Image:     fmt.Sprintf("%s:%s.%s.%s", image, v.Major, v.Minor, patchVersion(v)),
 						Args:      []string{"get", "pods", "-n", namespace, "--no-headers", "-o", "custom-columns=:.metadata.name"},
 						Resources: util.ResourceRequirements(),
 					}},
@@ -113,3 +114,12 @@ func CreateRoleBinding(ctx context.Context, cl client.Client, namespace string)
 	}
 	return cl.Create(ctx, rb)
 }
+
+func patchVersion(v *version.Info) string {
+	tmp := strings.Split(v.GitVersion, ".")
+	if len(tmp) < 3 {
+		return ""
+	}
+	patch := tmp[2]
+	return strings.Split(patch, "+")[0]
+}