Skip to content

Commit a4f54cc

Browse files
authored
Merge pull request #2099 from jackfrancis/aks-test-rm-timesync
don’t validate timesync during capz E2E
2 parents 0f80cb7 + f21b351 commit a4f54cc

File tree

4 files changed

+1
-321
lines changed

4 files changed

+1
-321
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ require (
4646
sigs.k8s.io/cluster-api/test v1.1.2
4747
sigs.k8s.io/controller-runtime v0.11.1
4848
sigs.k8s.io/kind v0.11.1
49-
sigs.k8s.io/yaml v1.3.0
5049
)
5150

5251
require (
@@ -171,6 +170,7 @@ require (
171170
sigs.k8s.io/kustomize/api v0.10.1 // indirect
172171
sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
173172
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
173+
sigs.k8s.io/yaml v1.3.0 // indirect
174174
)
175175

176176
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.1

test/e2e/azure_test.go

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,6 @@ var _ = Describe("Workload cluster creation", func() {
174174
WaitForMachineDeployments: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
175175
}, result)
176176

177-
Context("Validating time synchronization", func() {
178-
AzureTimeSyncSpec(ctx, func() AzureTimeSyncSpecInput {
179-
return AzureTimeSyncSpecInput{
180-
BootstrapClusterProxy: bootstrapClusterProxy,
181-
Namespace: namespace,
182-
ClusterName: clusterName,
183-
}
184-
})
185-
})
186-
187177
Context("Creating a private cluster from the management cluster", func() {
188178
AzurePrivateClusterSpec(ctx, func() AzurePrivateClusterSpecInput {
189179
return AzurePrivateClusterSpecInput{
@@ -229,16 +219,6 @@ var _ = Describe("Workload cluster creation", func() {
229219
WaitForMachineDeployments: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
230220
}, result)
231221

232-
Context("Validating time synchronization", func() {
233-
AzureTimeSyncSpec(ctx, func() AzureTimeSyncSpecInput {
234-
return AzureTimeSyncSpecInput{
235-
BootstrapClusterProxy: bootstrapClusterProxy,
236-
Namespace: namespace,
237-
ClusterName: clusterName,
238-
}
239-
})
240-
})
241-
242222
Context("Validating failure domains", func() {
243223
AzureFailureDomainsSpec(ctx, func() AzureFailureDomainsSpecInput {
244224
return AzureFailureDomainsSpecInput{
@@ -307,16 +287,6 @@ var _ = Describe("Workload cluster creation", func() {
307287
WaitForMachineDeployments: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
308288
}, result)
309289

310-
Context("Validating time synchronization", func() {
311-
AzureTimeSyncSpec(ctx, func() AzureTimeSyncSpecInput {
312-
return AzureTimeSyncSpecInput{
313-
BootstrapClusterProxy: bootstrapClusterProxy,
314-
Namespace: namespace,
315-
ClusterName: clusterName,
316-
}
317-
})
318-
})
319-
320290
Context("Creating an accessible ipv6 load balancer", func() {
321291
AzureLBSpec(ctx, func() AzureLBSpecInput {
322292
return AzureLBSpecInput{
@@ -371,16 +341,6 @@ var _ = Describe("Workload cluster creation", func() {
371341
})
372342
})
373343

374-
Context("Validating time synchronization", func() {
375-
AzureTimeSyncSpec(ctx, func() AzureTimeSyncSpecInput {
376-
return AzureTimeSyncSpecInput{
377-
BootstrapClusterProxy: bootstrapClusterProxy,
378-
Namespace: namespace,
379-
ClusterName: clusterName,
380-
}
381-
})
382-
})
383-
384344
Context("Creating an accessible load balancer", func() {
385345
AzureLBSpec(ctx, func() AzureLBSpecInput {
386346
return AzureLBSpecInput{
@@ -528,16 +488,6 @@ var _ = Describe("Workload cluster creation", func() {
528488
WaitForControlPlaneMachinesReady: WaitForControlPlaneMachinesReady,
529489
},
530490
}, result)
531-
532-
Context("Validating AKS time synchronization", func() {
533-
AzureDaemonsetTimeSyncSpec(ctx, func() AzureTimeSyncSpecInput {
534-
return AzureTimeSyncSpecInput{
535-
BootstrapClusterProxy: bootstrapClusterProxy,
536-
Namespace: namespace,
537-
ClusterName: clusterName,
538-
}
539-
})
540-
})
541491
})
542492
})
543493

test/e2e/azure_timesync.go

Lines changed: 0 additions & 245 deletions
This file was deleted.

test/e2e/workloads/nsenter/daemonset.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)