Merge pull request #610 from alexander-demicev/rke2vsphere

Add RKE2 vSphere case to E2E suite
rancher · Jul 24, 2024 · 02e58b9 · 02e58b9
2 parents 2cbdc02 + 737d58c
commit 02e58b9
Show file tree

Hide file tree

Showing 8 changed files with 1,084 additions and 1 deletion.
diff --git a/test/e2e/config/operator.yaml b/test/e2e/config/operator.yaml
@@ -14,6 +14,7 @@ intervals:
   default/wait-capz-create-cluster: ["35m", "30s"]
   default/wait-capv-create-cluster: ["30m", "30s"]
   default/wait-gitea: ["3m", "10s"]
+  default/wait-gitpush: ["3m", "10s"]
   default/wait-consistently: ["30s", "5s"]
   default/wait-getservice: ["5m", "30s"]
   default/wait-eks-delete: ["35m", "30s"]
@@ -34,7 +35,7 @@ variables:
   RANCHER_FEATURES: ""
   RANCHER_PATH: "rancher-latest/rancher"
   CPI_IMAGE_K8S_VERSION: "v1.27.0"
-  RKE2_VERSION: "v1.26.8+rke2r1"
+  RKE2_VERSION: "v1.28.1+rke2r1"
   RANCHER_REPO_NAME: "rancher-latest"
   RANCHER_URL: "https://releases.rancher.com/server-charts/latest"
   CERT_MANAGER_URL: "https://charts.jetstack.io"

diff --git a/test/e2e/const.go b/test/e2e/const.go
@@ -81,6 +81,9 @@ var (
 	//go:embed data/cluster-templates/vsphere-kubeadm.yaml
 	CAPIvSphereKubeadm []byte
 
+	//go:embed data/cluster-templates/vsphere-rke2.yaml
+	CAPIvSphereRKE2 []byte
+
 	//go:embed data/gitea/ingress.yaml
 	GiteaIngress []byte
 )