Skip to content

[release-1.11] 🌱 e2e: allow usage of v1beta1 and v1beta2 for MachinePools in clusterctl upgrade #13023

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
k8s-ci-robot merged 2 commits into from
Nov 21, 2025
Merged

[release-1.11] 🌱 e2e: allow usage of v1beta1 and v1beta2 for MachinePools in clusterctl upgrade #13023

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b40276
test: fix MachinePool on upgrades to use correct struct for infrastru…
chrischdi Sep 3, 2025
3ffd0f9
fix e2e
chrischdi Sep 4, 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
33 changes: 25 additions & 8 deletions test/e2e/clusterctl_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,16 +1006,33 @@ func calculateExpectedMachinePoolMachineCount(ctx context.Context, c client.Clie
client.MatchingLabels{clusterv1.ClusterNameLabel: workloadClusterName},
); err == nil {
for _, mp := range machinePoolList.Items {
ref := &corev1.ObjectReference{}
err = util.UnstructuredUnmarshalField(&mp, ref, "spec", "template", "spec", "infrastructureRef")
if err != nil && !errors.Is(err, util.ErrUnstructuredFieldNotFound) {
return 0, err
}
var infraMachinePool *unstructured.Unstructured

// Fallback to v1beta1's objectReference
if clusterv1.GroupVersion.Version == "v1beta1" {
Copy link
Copy Markdown
Member

@sbueringer sbueringer Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if clusterv1.GroupVersion.Version == "v1beta1" {
if coreCAPIStorageVersion == "v1beta1" {

Shouldn't this be like this instead?

Copy link
Copy Markdown
Member Author

@chrischdi chrischdi Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoop, yeah ! good catch...

ref := &corev1.ObjectReference{}
err = util.UnstructuredUnmarshalField(&mp, ref, "spec", "template", "spec", "infrastructureRef")
if err != nil && !errors.Is(err, util.ErrUnstructuredFieldNotFound) {
return 0, err
}

infraMachinePool, err := external.Get(ctx, c, ref)
if err != nil {
return 0, err
infraMachinePool, err = external.Get(ctx, c, ref)
if err != nil {
return 0, err
}
} else {
ref := clusterv1.ContractVersionedObjectReference{}
err = util.UnstructuredUnmarshalField(&mp, &ref, "spec", "template", "spec", "infrastructureRef")
if err != nil && !errors.Is(err, util.ErrUnstructuredFieldNotFound) {
return 0, err
}

infraMachinePool, err = external.GetObjectFromContractVersionedRef(ctx, c, ref, mp.GetNamespace())
if err != nil {
return 0, err
}
}

// Check if the InfraMachinePool has an infrastructureMachineKind field. If it does not, we should skip checking for MachinePool machines.
err = util.UnstructuredUnmarshalField(infraMachinePool, ptr.To(""), "status", "infrastructureMachineKind")
if err != nil && !errors.Is(err, util.ErrUnstructuredFieldNotFound) {
Expand Down
Loading