Skip to content

🐛 E2E: Propagate clusterctl variables for cluster upgrades #12949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2025
+5 −0
Merged

🐛 E2E: Propagate clusterctl variables for cluster upgrades #12949

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed0e13
test(e2e): propagate clusterctl variables
vknabel Nov 4, 2025
2b3e60d
feat(e2e): use clusterctl variables from input instead
vknabel Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions test/e2e/cluster_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -151,6 +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.ClusterctlVariables,
KubeconfigPath: input.BootstrapClusterProxy.GetKubeconfigPath(),
InfrastructureProvider: infrastructureProvider,
Flavor: ptr.Deref(input.Flavor, "upgrades"),
Expand Down