From 6d949b7662d4c641f1fabcaea98f284939f64238 Mon Sep 17 00:00:00 2001 From: Sagar Muchhal Date: Mon, 1 Feb 2021 11:12:38 -0800 Subject: [PATCH] Rebase for compilation issues --- test/e2e/cluster_upgrade.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index 0ec4afe14b8d..4b2f1e063d4c 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -73,6 +73,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust // Setup a Namespace where to host objects for this spec and create a watcher for the Namespace events. namespace, cancelWatches = setupSpecNamespace(ctx, specName, input.BootstrapClusterProxy, input.ArtifactFolder) + clusterResources = new(clusterctl.ApplyClusterTemplateAndWaitResult) }) It("Should create and upgrade a workload cluster and run kubetest", func() { @@ -81,7 +82,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust var workerMachineCount int64 = 3 - clusterResources = clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{ + clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{ ClusterProxy: input.BootstrapClusterProxy, ConfigCluster: clusterctl.ConfigClusterInput{ LogFolder: filepath.Join(input.ArtifactFolder, "clusters", input.BootstrapClusterProxy.GetName()), @@ -99,7 +100,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust WaitForControlPlaneIntervals: input.E2EConfig.GetIntervals(specName, "wait-control-plane"), WaitForMachineDeployments: input.E2EConfig.GetIntervals(specName, "wait-worker-nodes"), WaitForMachinePools: input.E2EConfig.GetIntervals(specName, "wait-machine-pool-nodes"), - }) + }, clusterResources) By("Upgrading the kubernetes control-plane") framework.UpgradeControlPlaneAndWaitForUpgrade(ctx, framework.UpgradeControlPlaneAndWaitForUpgradeInput{