ci: use Rancher v2.13 for e2e (#1843)

anmazzotti · web-flow · commit 03bc0ddd9366 · 2025-10-27T23:03:03.000+02:00
Signed-off-by: Andrea Mazzotti &lt;andrea.mazzotti@suse.com&gt;
diff --git a/.github/workflows/test_chart.yaml b/.github/workflows/test_chart.yaml
@@ -16,7 +16,7 @@ env:
   CONTROLLER_IMG: controller
   PULL_POLICY: Never
   CERT_MANAGER_VERSION: v1.16.3
-  RANCHER_VERSION: v2.12.1
+  RANCHER_VERSION: v2.13.0-alpha3
 
 jobs:
   prime-test:
@@ -80,16 +80,16 @@ jobs:
         run: helm repo add jetstack https://charts.jetstack.io
 
       - name: Add rancher chart repo
-        run: helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
+        run: helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha
 
       - name: Install cert-manager
         run: helm install cert-manager jetstack/cert-manager --namespace cert-manager --create-namespace --version ${{ env.CERT_MANAGER_VERSION }} --set crds.enabled=true --set crds.keep=true --wait
 
       - name: Install Rancher
-        run: helm install rancher rancher-latest/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --set 'extraEnv[0].name=CATTLE_FEATURES' --version ${{ env.RANCHER_VERSION }} --wait
+        run: helm install rancher rancher-alpha/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --set 'extraEnv[0].name=CATTLE_FEATURES' --set 'extraEnv[0].value=turtles=false' --version ${{ env.RANCHER_VERSION }} --wait
 
       - name: Run chart-testing (install)
-        run: helm install rancher-turtles out/charts/rancher-turtles/ -n cattle-turtles-system --create-namespace --wait --debug
+        run: helm install rancher-turtles out/charts/rancher-turtles/ -n rancher-turtles-system --set namespace=rancher-turtles-system --create-namespace --wait --debug
 
       - name: Wait for core provider rollout
         run: sleep 30 && kubectl rollout status deployment capi-controller-manager -n cattle-capi-system --timeout=10m
@@ -102,10 +102,10 @@ jobs:
           fi
 
       - name: Run chart-testing (un-install)
-        run: helm uninstall rancher-turtles -n cattle-turtles-system --cascade foreground --wait --debug --timeout=10m
+        run: helm uninstall rancher-turtles -n rancher-turtles-system --cascade foreground --wait --debug --timeout=10m
 
       - name: Run chart re-install
-        run: helm install rancher-turtles out/charts/rancher-turtles/ -n cattle-turtles-system --create-namespace --wait --debug
+        run: helm install rancher-turtles out/charts/rancher-turtles/ -n rancher-turtles-system --set namespace=rancher-turtles-system --create-namespace --wait --debug
 
   community-test:
     runs-on: ubuntu-latest
@@ -155,10 +155,10 @@ jobs:
         run: helm repo add jetstack https://charts.jetstack.io && helm install cert-manager jetstack/cert-manager --namespace cert-manager --create-namespace --version ${{ env.CERT_MANAGER_VERSION }} --set crds.enabled=true --set crds.keep=true --wait
 
       - name: Install Rancher
-        run: helm repo add rancher-latest https://releases.rancher.com/server-charts/latest && helm install rancher rancher-latest/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --version ${{ env.RANCHER_VERSION }} --wait
+        run: helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha && helm install rancher rancher-alpha/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --set 'extraEnv[0].name=CATTLE_FEATURES' --set 'extraEnv[0].value=turtles=false' --version ${{ env.RANCHER_VERSION }} --wait
 
       - name: Install rancher-turtles chart
-        run: helm install rancher-turtles out/charts/rancher-turtles/ -n cattle-turtles-system --create-namespace --wait --debug
+        run: helm install rancher-turtles out/charts/rancher-turtles/ -n rancher-turtles-system --set namespace=rancher-turtles-system --create-namespace --wait --debug
 
       - name: Wait for core provider rollout
         run: sleep 30 && kubectl rollout status deployment capi-controller-manager -n cattle-capi-system --timeout=10m
diff --git a/internal/controllers/testdata/import_sample.yaml b/internal/controllers/testdata/import_sample.yaml
@@ -192,7 +192,7 @@ spec:
             value: 726f86e0-b3bc-41f1-9757-8a0ee24560f4
           - name: CATTLE_INGRESS_IP_DOMAIN
             value: sslip.io
-          image: rancher/rancher-agent:v2.12.1
+          image: rancher/rancher-agent:v2.13.0-alpha3
           volumeMounts:
           - name: cattle-credentials
             mountPath: /cattle-credentials
diff --git a/scripts/turtles-quickstart.sh b/scripts/turtles-quickstart.sh
@@ -18,7 +18,7 @@
 set -e
 
 RANCHER_CHANNEL=${RANCHER_CHANNEL:-latest}
-RANCHER_VERSION=${RANCHER_VERSION:-v2.12.1}
+RANCHER_VERSION=${RANCHER_VERSION:-v2.13.0-alpha3}
 RANCHER_IMAGE=${RANCHER_IMAGE:-rancher/rancher:$RANCHER_VERSION}
 RANCHER_CLUSTER_NAME=${RANCHER_CLUSTER_NAME:-rancher-cluster}
 RANCHER_TURTLES_VERSION=${RANCHER_TURTLES_VERSION:-v0.24.1}
diff --git a/test/e2e/README.md b/test/e2e/README.md
@@ -162,7 +162,7 @@ Most notable ones:
 
 ```yaml
 variables:
-  RANCHER_VERSION: "v2.12.1" # Default rancher version to install
+  RANCHER_VERSION: "v2.13.0-alpha3" # Default rancher version to install
   RANCHER_HOSTNAME: "localhost" # Your ngrok domain
   NGROK_API_KEY: "" # Key and token values for establishing ingress
   NGROK_AUTHTOKEN: ""
diff --git a/test/e2e/config/operator.yaml b/test/e2e/config/operator.yaml
@@ -73,10 +73,10 @@ variables:
   HELM_EXTRA_VALUES_FOLDER: "/tmp"
 
   # Rancher Configuration
-  RANCHER_VERSION: "v2.12.1"
-  RANCHER_REPO_NAME: "rancher-latest"
-  RANCHER_PATH: "rancher-latest/rancher"
-  RANCHER_URL: "https://releases.rancher.com/server-charts/latest"
+  RANCHER_VERSION: "v2.13.0-alpha3"
+  RANCHER_REPO_NAME: "rancher-alpha"
+  RANCHER_PATH: "rancher-alpha/rancher"
+  RANCHER_URL: "https://releases.rancher.com/server-charts/alpha"
   RANCHER_HOSTNAME: "localhost"
   RANCHER_PASSWORD: "rancheradmin"
 
diff --git a/test/e2e/const.go b/test/e2e/const.go
@@ -136,13 +136,10 @@ var (
 
 	//go:embed data/test-providers/clusterctlconfig-updated.yaml
 	ClusterctlConfigUpdated []byte
-
-	//go:embed data/rancher/pre-turtles-install.yaml
-	RancherTurtlesPreInstall []byte
 )
 
 const (
-	RancherTurtlesNamespace = "cattle-turtles-system"
+	RancherTurtlesNamespace = "rancher-turtles-system"
 	RancherNamespace        = "cattle-system"
 	NginxIngressNamespace   = "ingress-nginx"
 	NginxIngressDeployment  = "ingress-nginx-controller"
diff --git a/test/e2e/data/capi-operator/clusterctlconfig.yaml b/test/e2e/data/capi-operator/clusterctlconfig.yaml
@@ -2,7 +2,7 @@ apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: ClusterctlConfig
 metadata:
   name: clusterctl-config
-  namespace: cattle-turtles-system
+  namespace: rancher-turtles-system
 spec:
   images:
   - name: infrastructure-docker
diff --git a/test/e2e/data/rancher/pre-turtles-install.yaml b/test/e2e/data/rancher/pre-turtles-install.yaml
diff --git a/test/e2e/data/test-providers/clusterctlconfig-updated.yaml b/test/e2e/data/test-providers/clusterctlconfig-updated.yaml
@@ -2,7 +2,7 @@ apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: ClusterctlConfig
 metadata:
   name: clusterctl-config
-  namespace: cattle-turtles-system
+  namespace: rancher-turtles-system
 spec:
   providers:
   - name: vsphere
diff --git a/test/e2e/data/test-providers/clusterctlconfig.yaml b/test/e2e/data/test-providers/clusterctlconfig.yaml
@@ -2,7 +2,7 @@ apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: ClusterctlConfig
 metadata:
   name: clusterctl-config
-  namespace: cattle-turtles-system
+  namespace: rancher-turtles-system
 spec:
   providers:
   - name: vsphere
diff --git a/test/framework/const.go b/test/framework/const.go
@@ -26,5 +26,5 @@ const (
 	// MagicDNS is the dns name to use in isolated mode
 	MagicDNS = "sslip.io"
 	// DefaulRancherTurtlesNamespace is the name of the default namespace for Rancher Turtles.
-	DefaultRancherTurtlesNamespace = "cattle-turtles-system"
+	DefaultRancherTurtlesNamespace = "rancher-turtles-system"
 )
diff --git a/test/framework/kube_helper.go b/test/framework/kube_helper.go
@@ -226,7 +226,7 @@ type CreateDockerRegistrySecretInput struct {
 	Name string `envDefault:"regcred"`
 
 	// Namespace is the namespace where the secret will be created.
-	Namespace string `envDefault:"cattle-turtles-system"`
+	Namespace string `envDefault:"rancher-turtles-system"`
 
 	// DockerServer is the Docker server URL.
 	DockerServer string `envDefault:"https://ghcr.io/"`
diff --git a/test/testenv/operator.go b/test/testenv/operator.go
@@ -35,6 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	turtlesv1 "github.com/rancher/turtles/api/v1alpha1"
+	"github.com/rancher/turtles/test/e2e"
 	turtlesframework "github.com/rancher/turtles/test/framework"
 )
 
@@ -130,7 +131,7 @@ func CAPIOperatorDeployProvider(ctx context.Context, input CAPIOperatorDeployPro
 
 			clusterctl := turtlesframework.GetClusterctl(ctx, turtlesframework.GetClusterctlInput{
 				GetLister:          input.BootstrapClusterProxy.GetClient(),
-				ConfigMapNamespace: "cattle-turtles-system",
+				ConfigMapNamespace: e2e.RancherTurtlesNamespace,
 				ConfigMapName:      "clusterctl-config",
 			})
 
diff --git a/test/testenv/providers.go b/test/testenv/providers.go
@@ -392,7 +392,7 @@ func configureProviderDefaults(ctx context.Context, input DeployRancherTurtlesPr
 			By("Configuring Docker provider with OCI registry")
 			clusterctl := turtlesframework.GetClusterctl(ctx, turtlesframework.GetClusterctlInput{
 				GetLister:          input.BootstrapClusterProxy.GetClient(),
-				ConfigMapNamespace: "cattle-turtles-system",
+				ConfigMapNamespace: e2e.RancherTurtlesNamespace,
 				ConfigMapName:      "clusterctl-config",
 			})
 			dockerVersion := getProviderVersion(clusterctl, "docker")
diff --git a/test/testenv/rancher.go b/test/testenv/rancher.go
@@ -233,6 +233,8 @@ func DeployRancher(ctx context.Context, input DeployRancherInput) PreRancherInst
 		"--namespace", input.RancherNamespace,
 		"--create-namespace",
 		"--values", input.HelmExtraValuesPath,
+		"--set", "extraEnv[0].name=CATTLE_FEATURES",
+		"--set", "extraEnv[0].value=turtles=false",
 	)
 	if input.RancherVersion != "" {
 		installFlags = append(installFlags, "--version", input.RancherVersion)
@@ -292,12 +294,6 @@ func DeployRancher(ctx context.Context, input DeployRancherInput) PreRancherInst
 		})).To(Succeed())
 	}
 
-	By("Waiting for rancher webhook rollout")
-	framework.WaitForDeploymentsAvailable(ctx, framework.WaitForDeploymentsAvailableInput{
-		Getter:     input.BootstrapClusterProxy.GetClient(),
-		Deployment: &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "rancher-webhook", Namespace: input.RancherNamespace}},
-	}, input.RancherWaitInterval...)
-
 	// hack: fleet controller needs to be restarted first to pickup config change with a valid API url.
 	framework.WaitForDeploymentsAvailable(ctx, framework.WaitForDeploymentsAvailableInput{
 		Getter:     input.BootstrapClusterProxy.GetClient(),
diff --git a/test/testenv/turtles.go b/test/testenv/turtles.go
@@ -17,7 +17,6 @@ limitations under the License.
 package testenv
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"os/exec"
@@ -82,7 +81,7 @@ type DeployRancherTurtlesInput struct {
 	ConfigurationPatches [][]byte
 
 	// Namespace is the namespace for deploying Rancher Turtles.
-	Namespace string `envDefault:"cattle-turtles-system"`
+	Namespace string `envDefault:"rancher-turtles-system"`
 
 	// ImageRegistry is the image registry for Rancher Turtles.
 	ImageRegistry string `env:"TURTLES_IMAGE_REGISTRY"`
@@ -115,7 +114,7 @@ type UninstallRancherTurtlesInput struct {
 	HelmBinaryPath string `env:"HELM_BINARY_PATH"`
 
 	// Namespace is the namespace where Rancher Turtles are installed.
-	Namespace string `envDefault:"cattle-turtles-system"`
+	Namespace string `envDefault:"rancher-turtles-system"`
 
 	// DeleteWaitInterval is the wait interval for deleting resources.
 	DeleteWaitInterval []interface{} `envDefault:"10m,10s"`
@@ -161,34 +160,10 @@ func DeployRancherTurtles(ctx context.Context, input DeployRancherTurtlesInput)
 		Expect(err).ToNot(HaveOccurred())
 	}
 
-	// this is a temporary workaround for installing turtles chart as extension
-	// after the pre-install hook has been removed and before it becomes a part of Rancher.
-	By("Disabling Rancher embedded CAPI")
-	Expect(turtlesframework.Apply(ctx, input.BootstrapClusterProxy, e2e.RancherTurtlesPreInstall)).To(Succeed())
-	webhooks := map[string]string{
-		"mutatingwebhookconfiguration":   "mutating-webhook-configuration",
-		"validatingwebhookconfiguration": "validating-webhook-configuration",
-	}
-	for wtype, wname := range webhooks {
-		By("Removing " + wname + " webhook")
-		cmd := exec.Command("kubectl", []string{
-			"--kubeconfig", input.BootstrapClusterProxy.GetKubeconfigPath(),
-			"delete",
-			wtype, wname,
-			"--ignore-not-found",
-		}...)
-		var stdout, stderr bytes.Buffer
-		cmd.Stdout = &stdout
-		cmd.Stderr = &stderr
-		cmd.WaitDelay = time.Minute
-
-		err := cmd.Run()
-		Expect(err).ToNot(HaveOccurred(), "Failed to remove webhook %s: %s", wname, stderr.String())
-	}
-
 	By("Installing rancher-turtles chart")
 	values := map[string]string{
 		"cluster-api-operator.cluster-api.configSecret.name": "variables",
+		"namespace": input.Namespace,
 	}
 
 	if input.Version == "" {
@@ -277,7 +252,7 @@ type UpgradeRancherTurtlesInput struct {
 	HelmBinaryPath string `env:"HELM_BINARY_PATH"`
 
 	// Namespace is the namespace for the deployment.
-	Namespace string `envDefault:"cattle-turtles-system"`
+	Namespace string `envDefault:"rancher-turtles-system"`
 
 	// WaitDeploymentsReadyInterval is the interval for waiting until deployments are ready.
 	WaitDeploymentsReadyInterval []interface{} `envDefault:"15m,10s"`
