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.

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

Don't install CNI twice in e2e tests #4323

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Don't install CNI twice in e2e tests #4323

Show file tree
Hide file tree
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
26 changes: 13 additions & 13 deletions test/e2e/azure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ var _ = Describe("Workload cluster creation", func() {
withControlPlaneMachineCount(1),
withWorkerMachineCount(1),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -224,7 +224,7 @@ var _ = Describe("Workload cluster creation", func() {
withWorkerMachineCount(2),
withControlPlaneInterval(specName, "wait-control-plane-ha"),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -322,7 +322,7 @@ var _ = Describe("Workload cluster creation", func() {
withWorkerMachineCount(2),
withControlPlaneInterval(specName, "wait-control-plane-ha"),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -381,7 +381,7 @@ var _ = Describe("Workload cluster creation", func() {
withControlPlaneMachineCount(1),
withWorkerMachineCount(1),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -419,7 +419,7 @@ var _ = Describe("Workload cluster creation", func() {
withWorkerMachineCount(1),
withControlPlaneInterval(specName, "wait-control-plane-ha"),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -479,7 +479,7 @@ var _ = Describe("Workload cluster creation", func() {
withControlPlaneInterval(specName, "wait-control-plane"),
withMachinePoolInterval(specName, "wait-machine-pool-nodes"),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -547,7 +547,7 @@ var _ = Describe("Workload cluster creation", func() {
withWorkerMachineCount(1),
withMachineDeploymentInterval(specName, "wait-gpu-nodes"),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -606,7 +606,7 @@ var _ = Describe("Workload cluster creation", func() {
withKubernetesVersion("v1.26.1"),
withMachineDeploymentInterval(specName, ""),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withMachinePoolInterval(specName, "wait-machine-pool-nodes"),
withControlPlaneInterval(specName, "wait-control-plane"),
Expand Down Expand Up @@ -662,7 +662,7 @@ var _ = Describe("Workload cluster creation", func() {
withControlPlaneMachineCount(1),
withWorkerMachineCount(2),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -910,7 +910,7 @@ var _ = Describe("Workload cluster creation", func() {
withWorkerMachineCount(1),
withControlPlaneInterval(specName, "wait-control-plane-ha"),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -984,7 +984,7 @@ var _ = Describe("Workload cluster creation", func() {
withControlPlaneMachineCount(1),
withWorkerMachineCount(1),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -1028,7 +1028,7 @@ var _ = Describe("Workload cluster creation", func() {
withControlPlaneMachineCount(1),
withWorkerMachineCount(1),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down Expand Up @@ -1069,7 +1069,7 @@ var _ = Describe("Workload cluster creation", func() {
withControlPlaneMachineCount(1),
withWorkerMachineCount(2),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
withPostMachinesProvisioned(func() {
EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
Expand Down
22 changes: 11 additions & 11 deletions test/e2e/capi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand All @@ -126,7 +126,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand All @@ -142,7 +142,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand All @@ -159,7 +159,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand All @@ -174,7 +174,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand All @@ -189,7 +189,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand All @@ -204,7 +204,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand Down Expand Up @@ -257,7 +257,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
PreInit: getPreInitFunc(ctx),
InitWithProvidersContract: "v1beta1",
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
},
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.5/clusterctl-{OS}-{ARCH}",
InitWithCoreProvider: "cluster-api:v1.0.5",
Expand All @@ -280,7 +280,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
SkipCleanup: skipCleanup,
SkipConformanceTests: true,
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand All @@ -298,7 +298,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
SkipCleanup: skipCleanup,
SkipConformanceTests: true,
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand All @@ -317,7 +317,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
SkipConformanceTests: true,
Flavor: ptr.To("kcp-scale-in"),
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
},
}
})
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/conformance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ var _ = Describe("Conformance Tests", func() {
withControlPlaneMachineCount(controlPlaneMachineCount),
withWorkerMachineCount(linuxWorkerMachineCount),
withControlPlaneWaiters(clusterctl.ControlPlaneWaiters{
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
}),
), result)
stopwatch.Record("cluster creation")
Expand Down
Loading