Skip to content

OCPCLOUD-3570: e2e skip Cluster API authoritative MachineSets in GetFirstMAPIMachineSet #610

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
openshift-merge-bot merged 1 commit into from
Jun 28, 2026
Merged

OCPCLOUD-3570: e2e skip Cluster API authoritative MachineSets in GetFirstMAPIMachineSet #610

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
16 changes: 13 additions & 3 deletions e2e/framework/providerspec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,28 @@ import (
"sigs.k8s.io/yaml"
)

// GetFirstMAPIMachineSet lists MAPI MachineSets, sorts by name, and returns the first one.
// GetFirstMAPIMachineSet lists MAPI MachineSets, sorts by name, and returns the first one
// whose authoritative API is Machine API. MachineSets synced from Cluster API are excluded
// because their machines are provisioned by Cluster API and carry no Machine API machine objects.
func GetFirstMAPIMachineSet(ctx context.Context, cl client.Client) *mapiv1beta1.MachineSet {
GinkgoHelper()

machineSetList := &mapiv1beta1.MachineSetList{}
Expect(cl.List(ctx, machineSetList, client.InNamespace(MAPINamespace))).To(Succeed(),
"should not fail listing MAPI MachineSets")
Expect(machineSetList.Items).ToNot(BeEmpty(), "expected to have at least a MachineSet")

SortListByName(machineSetList)

return &machineSetList.Items[0]
for i := range machineSetList.Items {
ms := &machineSetList.Items[i]
if ms.Spec.AuthoritativeAPI != mapiv1beta1.MachineAuthorityClusterAPI {
return ms
}
}
Comment thread
pmeida marked this conversation as resolved.

Fail("expected to find at least one Machine API authoritative MachineSet")

return nil
}

// GetMAPIProviderSpec lists MAPI MachineSets, sorts by name, and unmarshals
Expand Down