Skip to content
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.

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

[WIP]🏃 [e2e] enable UseExperimentalRetryJoin in the Basic e2e test #2784

Closed
Closed
Changes from all commits
Commits
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: 10 additions & 4 deletions test/infrastructure/docker/e2e/docker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var _ = Describe("Docker", func() {
namespace string
clusterGen = &ClusterGenerator{}
)
SetDefaultEventuallyTimeout(3 * time.Minute)
SetDefaultEventuallyTimeout(10 * time.Minute)
SetDefaultEventuallyPollingInterval(10 * time.Second)

BeforeEach(func() {
Expand Down Expand Up @@ -79,6 +79,7 @@ var _ = Describe("Docker", func() {
err error
)
cluster, infraCluster, controlPlane, template = clusterGen.GenerateCluster(namespace, int32(replicas))
controlPlane.Spec.KubeadmConfigSpec.UseExperimentalRetryJoin = true
// Set failure domains here
infraCluster.Spec.FailureDomains = clusterv1.FailureDomains{
"domain-one": {ControlPlane: true},
Expand All @@ -87,8 +88,13 @@ var _ = Describe("Docker", func() {
"domain-four": {ControlPlane: false},
}

md, infraTemplate, bootstrapTemplate := GenerateMachineDeployment(cluster, 1)

md, infraTemplate, bootstrapTemplate := GenerateMachineDeployment(cluster, 3)
bootstrapTemplate.Spec.Template.Spec.UseExperimentalRetryJoin = true
md.Spec.Template.Spec.Bootstrap.ConfigRef = &corev1.ObjectReference{
APIVersion: bootstrapTemplate.APIVersion,
Kind: bootstrapTemplate.Kind,
Name: bootstrapTemplate.Name,
}
// Set up the client to the management cluster
mgmtClient, err = mgmt.GetClient()
Expect(err).NotTo(HaveOccurred())
Expand Down Expand Up @@ -122,7 +128,7 @@ var _ = Describe("Docker", func() {
Cluster: cluster,
ControlPlane: controlPlane,
}
framework.WaitForOneKubeadmControlPlaneMachineToExist(ctx, waitForOneKubeadmControlPlaneMachineToExistInput, "5m")
framework.WaitForOneKubeadmControlPlaneMachineToExist(ctx, waitForOneKubeadmControlPlaneMachineToExistInput, "10m")

// Insatll a networking solution on the workload cluster
workloadClient, err := mgmt.GetWorkloadClient(ctx, cluster.Namespace, cluster.Name)
Expand Down