Always pick first served version of CRD while building gvk for machine

Signed-off-by: Furkat Gofurov <[email protected]>
kubernetes-sigs · Aug 10, 2023 · 4db8bf6 · 4db8bf6
1 parent 4421b8d
commit 4db8bf6
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/test/e2e/clusterctl_upgrade.go b/test/e2e/clusterctl_upgrade.go
@@ -396,9 +396,16 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
 
 		// Build GroupVersionKind for Machine resources
 		machineListGVK := schema.GroupVersionKind{
-			Group:   machineCRD.Spec.Group,
-			Version: machineCRD.Spec.Versions[0].Name,
-			Kind:    machineCRD.Spec.Names.ListKind,
+			Group: machineCRD.Spec.Group,
+			Kind:  machineCRD.Spec.Names.ListKind,
+		}
+
+		// Pick the first served version
+		for _, gvk := range machineCRD.Spec.Versions {
+			if gvk.Served {
+				machineListGVK.Version = gvk.Name
+				break
+			}
 		}
 
 		By("Waiting for the machines to exist")