Skip to content

[release-1.9] 🌱 Fix e2e test capi-e2e-release-1.8 #12396

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
Jun 25, 2025
Merged

[release-1.9] 🌱 Fix e2e test capi-e2e-release-1.8 #12396

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: 16 additions & 0 deletions test/e2e/self_hosted.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,14 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
return selfHostedClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: "kube-system"}, kubeSystem)
}, "5s", "100ms").Should(BeNil(), "Failed to assert self-hosted API server stability")

By("Ensure all machines have NodeRef before doing move")
// Ensure all machines have NodeRef before attempting to move.
// This prevents clusterctl move failures when machines are still provisioning.
framework.WaitForClusterMachineNodeRefs(ctx, framework.WaitForClusterMachineNodeRefsInput{
GetLister: input.BootstrapClusterProxy.GetClient(),
Cluster: cluster,
}, input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade")...)

// Get the machines of the workloadCluster before it is moved to become self-hosted to make sure that the move did not trigger
// any unexpected rollouts.
preMoveMachineList := &unstructured.UnstructuredList{}
Expand Down Expand Up @@ -447,6 +455,14 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
return selfHostedClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: "kube-system"}, kubeSystem)
}, "5s", "100ms").Should(BeNil(), "Failed to assert self-hosted API server stability")

By("Ensure all machines have NodeRef before doing move back")
// Ensure all machines have NodeRef before attempting to move back to bootstrap.
// This prevents clusterctl move failures when machines are still provisioning.
framework.WaitForClusterMachineNodeRefs(ctx, framework.WaitForClusterMachineNodeRefsInput{
GetLister: selfHostedClusterProxy.GetClient(),
Cluster: selfHostedCluster,
}, input.E2EConfig.GetIntervals(specName, "wait-machine-upgrade")...)

By("Moving the cluster back to bootstrap")
clusterctl.Move(ctx, clusterctl.MoveInput{
LogFolder: filepath.Join(input.ArtifactFolder, "clusters", clusterResources.Cluster.Name),
Expand Down
Loading