Skip to content

Commit 6658a26

Browse files
authored
🐛 E2E: Propagate clusterctl variables for cluster upgrades (#12949)
* test(e2e): propagate clusterctl variables * feat(e2e): use clusterctl variables from input instead
1 parent 171e0ae commit 6658a26

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

test/e2e/cluster_upgrade.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ type ClusterUpgradeConformanceSpecInput struct {
7070
// Allows to inject a function to be run before checking control-plane machines to be upgraded.
7171
// If not specified, this is a no-op.
7272
PreWaitForControlPlaneToBeUpgraded func(managementClusterProxy framework.ClusterProxy, workloadClusterNamespace, workloadClusterName string)
73+
74+
// ClusterctlVariables allows injecting variables to the cluster template.
75+
// If not specified, this is a no-op.
76+
ClusterctlVariables map[string]string
7377
}
7478

7579
// ClusterUpgradeConformanceSpec implements a spec that upgrades a cluster and runs the Kubernetes conformance suite.
@@ -153,6 +157,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust
153157
ConfigCluster: clusterctl.ConfigClusterInput{
154158
LogFolder: filepath.Join(input.ArtifactFolder, "clusters", input.BootstrapClusterProxy.GetName()),
155159
ClusterctlConfigPath: input.ClusterctlConfigPath,
160+
ClusterctlVariables: input.ClusterctlVariables,
156161
KubeconfigPath: input.BootstrapClusterProxy.GetKubeconfigPath(),
157162
InfrastructureProvider: infrastructureProvider,
158163
Flavor: ptr.Deref(input.Flavor, "upgrades"),

0 commit comments

Comments
 (0)