From e7c1b8d14951c2b20cc24d3f870d3f30936c6935 Mon Sep 17 00:00:00 2001 From: Lennart Jern Date: Tue, 21 Oct 2025 09:39:25 +0000 Subject: [PATCH] E2E: Use kind cluster for clusterctl upgrade tests This enables the UseKindForManagementCluster flag for all clusterctl upgrade tests, which makes them use a kind cluster as the secondary management cluster instead of creating an OpenStack workload cluster. This significantly reduces the resource requirements for these tests by using lightweight kind containers instead of full VMs, and it also speeds up the test execution. Signed-off-by: Lennart Jern --- test/e2e/data/e2e_conf.yaml | 1 + test/e2e/suites/e2e/clusterctl_upgrade_test.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml index 9914f0eb09..6970e19207 100644 --- a/test/e2e/data/e2e_conf.yaml +++ b/test/e2e/data/e2e_conf.yaml @@ -218,6 +218,7 @@ variables: CNI: "../../data/cni/calico.yaml" CCM: "../../data/ccm/cloud-controller-manager.yaml" EXP_CLUSTER_RESOURCE_SET: "true" + IP_FAMILY: "ipv4" OPENSTACK_BASTION_IMAGE_NAME: "cirros-0.6.1-x86_64-disk" OPENSTACK_BASTION_IMAGE_URL: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2022-12-05/cirros-0.6.1-x86_64-disk.img OPENSTACK_BASTION_IMAGE_HASH: 0c839612eb3f2469420f2ccae990827f diff --git a/test/e2e/suites/e2e/clusterctl_upgrade_test.go b/test/e2e/suites/e2e/clusterctl_upgrade_test.go index 1af541d483..30be674888 100644 --- a/test/e2e/suites/e2e/clusterctl_upgrade_test.go +++ b/test/e2e/suites/e2e/clusterctl_upgrade_test.go @@ -68,6 +68,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and WorkloadFlavor: shared.FlavorCapiV1Beta1, InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion), InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"}, + UseKindForManagementCluster: true, } }) }) @@ -102,6 +103,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and WorkloadFlavor: shared.FlavorCapiV1Beta1, InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion), InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"}, + UseKindForManagementCluster: true, } }) }) @@ -136,6 +138,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.13=>current) and WorkloadFlavor: shared.FlavorDefault, InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion), InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"}, + UseKindForManagementCluster: true, } }) })