Skip to content

Commit

Permalink
[e2e] enable UseExperimentalRetryJoin in the Basic e2e test
Browse files Browse the repository at this point in the history
  • Loading branch information
Sedef committed Mar 25, 2020
1 parent 5028770 commit 34ee4e1
Showing 1 changed file with 10 additions and 4 deletions.
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

0 comments on commit 34ee4e1

Please sign in to comment.