From 5ed0e137fce68a67ddd7f1878adff0fec8f435e7 Mon Sep 17 00:00:00 2001 From: Valentin Knabel Date: Tue, 4 Nov 2025 13:09:07 +0100 Subject: [PATCH 1/2] test(e2e): propagate clusterctl variables --- test/e2e/cluster_upgrade.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index b905c593cc6b..a7290b8b40d4 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -151,6 +151,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust ConfigCluster: clusterctl.ConfigClusterInput{ LogFolder: filepath.Join(input.ArtifactFolder, "clusters", input.BootstrapClusterProxy.GetName()), ClusterctlConfigPath: input.ClusterctlConfigPath, + ClusterctlVariables: input.E2EConfig.Variables, KubeconfigPath: input.BootstrapClusterProxy.GetKubeconfigPath(), InfrastructureProvider: infrastructureProvider, Flavor: ptr.Deref(input.Flavor, "upgrades"), From 2b3e60dd73d8d1ec31f1efdda97c0c3680f50327 Mon Sep 17 00:00:00 2001 From: Valentin Knabel Date: Wed, 12 Nov 2025 10:52:46 +0100 Subject: [PATCH 2/2] feat(e2e): use clusterctl variables from input instead --- test/e2e/cluster_upgrade.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index a7290b8b40d4..2c7e68a267ba 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -70,6 +70,10 @@ type ClusterUpgradeConformanceSpecInput struct { // Allows to inject a function to be run before checking control-plane machines to be upgraded. // If not specified, this is a no-op. PreWaitForControlPlaneToBeUpgraded func(managementClusterProxy framework.ClusterProxy, workloadClusterNamespace, workloadClusterName string) + + // ClusterctlVariables allows injecting variables to the cluster template. + // If not specified, this is a no-op. + ClusterctlVariables map[string]string } // ClusterUpgradeConformanceSpec implements a spec that upgrades a cluster and runs the Kubernetes conformance suite. @@ -151,7 +155,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust ConfigCluster: clusterctl.ConfigClusterInput{ LogFolder: filepath.Join(input.ArtifactFolder, "clusters", input.BootstrapClusterProxy.GetName()), ClusterctlConfigPath: input.ClusterctlConfigPath, - ClusterctlVariables: input.E2EConfig.Variables, + ClusterctlVariables: input.ClusterctlVariables, KubeconfigPath: input.BootstrapClusterProxy.GetKubeconfigPath(), InfrastructureProvider: infrastructureProvider, Flavor: ptr.Deref(input.Flavor, "upgrades"),