clusterctl: add InitWithKubernetesVersion to ClusterctlUpgradeSpecInput

EmilienM · EmilienM · commit a79cce906704 · 2024-09-04T07:46:14.000-04:00
As we are only interested in testing a CAPO upgrade, this should stay in
sync with the k8s version used in other tests.
diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml
@@ -181,7 +181,6 @@ variables:
   OPENSTACK_VOLUME_TYPE_ALT: "test-volume-type"
   CONFORMANCE_WORKER_MACHINE_COUNT: "5"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
-  INIT_WITH_KUBERNETES_VERSION: "v1.30.1"
   E2E_IMAGE_URL: "http://10.0.3.15/capo-e2e-image.tar"
   # The default user for SSH connections from bastion to machines
   SSH_USER_MACHINE: "ubuntu"
diff --git a/test/e2e/suites/e2e/clusterctl_upgrade_test.go b/test/e2e/suites/e2e/clusterctl_upgrade_test.go
@@ -59,6 +59,7 @@ var _ = Describe("When testing clusterctl upgrades (v0.9=>current) [clusterctl-u
 			InitWithControlPlaneProviders:   []string{"kubeadm:" + OldCAPIVersion},
 			MgmtFlavor:                      shared.FlavorDefault,
 			WorkloadFlavor:                  shared.FlavorV1alpha7,
+			InitWithKubernetesVersion:       e2eCtx.E2EConfig.GetVariable(shared.KubernetesVersion),
 		}
 	})
 })

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ var _ = Describe("When testing clusterctl upgrades (v0.9=>current) [clusterctl-u`
`59`	`59`	`InitWithControlPlaneProviders: []string{"kubeadm:" + OldCAPIVersion},`
`60`	`60`	`MgmtFlavor: shared.FlavorDefault,`
`61`	`61`	`WorkloadFlavor: shared.FlavorV1alpha7,`
	`62`	`+ InitWithKubernetesVersion: e2eCtx.E2EConfig.GetVariable(shared.KubernetesVersion),`
`62`	`63`	`}`
`63`	`64`	`})`
`64`	`65`	`})`