Skip to content

[release-1.12] 🌱 Make clusterctl upgrade test to work when there are no machines #13074

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 1 commit into from
Nov 28, 2025
Merged

[release-1.12] 🌱 Make clusterctl upgrade test to work when there are no machines #13074

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions test/e2e/clusterctl_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,12 +738,14 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
Namespace: workloadCluster.Namespace,
})

Byf("[%d] Verify Machines Ready condition is true", i)
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
Lister: managementClusterProxy.GetClient(),
Name: workloadCluster.Name,
Namespace: workloadCluster.Namespace,
})
if len(postUpgradeMachineList.Items) > 0 {
Byf("[%d] Verify Machines Ready condition is true", i)
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
Lister: managementClusterProxy.GetClient(),
Name: workloadCluster.Name,
Namespace: workloadCluster.Namespace,
})
}
}

// Note: It is a known issue on Kubernetes < v1.29 that SSA sometimes fail:
Expand Down
Loading