Skip to content

Commit

Permalink
test: Don't delete and redeploy Cilium at end of each test context
Browse files Browse the repository at this point in the history
There is no point in doing this. Each test context will deploy Cilium in
BeforeAll() with the required configuration.

Signed-off-by: Thomas Graf <thomas@cilium.io>
  • Loading branch information
tgraf committed May 20, 2020
1 parent f2b7478 commit 5aee704
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 30 deletions.
2 changes: 0 additions & 2 deletions test/k8sT/Chaos.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ var _ = Describe("K8sChaosTest", func() {
})

AfterAll(func() {
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
kubectl.CloseSSHClient()
})

Expand Down
2 changes: 0 additions & 2 deletions test/k8sT/Conformance.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ var _ = Describe("K8sConformance", func() {

AfterEach(func() {
kubectl.Delete(connectivityCheckYaml)
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
})

Expand All @@ -44,7 +43,6 @@ var _ = Describe("K8sConformance", func() {
})

AfterAll(func() {
DeployCiliumAndDNS(kubectl, ciliumFilename)
kubectl.CloseSSHClient()
})

Expand Down
3 changes: 0 additions & 3 deletions test/k8sT/DatapathConfiguration.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ var _ = Describe("K8sDatapathConfig", func() {

AfterEach(func() {
deploymentManager.DeleteAll()
// FIXME(tgraf) Is this really needed?
deploymentManager.DeleteCilium()
})

AfterFailed(func() {
Expand All @@ -56,7 +54,6 @@ var _ = Describe("K8sDatapathConfig", func() {
})

AfterAll(func() {
DeployCiliumAndDNS(kubectl, helpers.TimestampFilename("cilium.yaml"))
kubectl.CloseSSHClient()
})

Expand Down
2 changes: 0 additions & 2 deletions test/k8sT/Health.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ var _ = Describe("K8sHealthTest", func() {
})

AfterAll(func() {
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
kubectl.CloseSSHClient()
})

Expand Down
6 changes: 0 additions & 6 deletions test/k8sT/Identity.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,12 @@ var _ = Describe("K8sIdentity", func() {
ciliumFilename = helpers.TimestampFilename("cilium.yaml")
})

AfterEach(func() {
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
})

AfterFailed(func() {
kubectl.CiliumReport(helpers.CiliumNamespace,
"cilium endpoint list")
})

AfterAll(func() {
DeployCiliumAndDNS(kubectl, ciliumFilename)
kubectl.CloseSSHClient()
})

Expand Down
2 changes: 0 additions & 2 deletions test/k8sT/KafkaPolicies.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ var _ = Describe("K8sKafkaPolicyTest", func() {
})

AfterAll(func() {
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
kubectl.CloseSSHClient()
})

Expand Down
2 changes: 0 additions & 2 deletions test/k8sT/Policies.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ var _ = Describe("K8sPolicyTest", func() {
})

AfterAll(func() {
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
kubectl.CloseSSHClient()
})

Expand Down
2 changes: 0 additions & 2 deletions test/k8sT/Services.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ var _ = Describe("K8sServicesTest", func() {
})

AfterAll(func() {
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
kubectl.CloseSSHClient()
})

Expand Down
2 changes: 0 additions & 2 deletions test/k8sT/demos.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ var _ = Describe("K8sDemosTest", func() {
})

AfterAll(func() {
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
kubectl.CloseSSHClient()
})

Expand Down
2 changes: 0 additions & 2 deletions test/k8sT/external_ips.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@ var _ = Describe("K8sKubeProxyFreeMatrix tests", func() {
return
}
_ = kubectl.NamespaceDelete(namespaceTest)
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
kubectl.CloseSSHClient()
})

Expand Down
1 change: 0 additions & 1 deletion test/k8sT/fqdn.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ var _ = Describe("K8sFQDNTest", func() {

AfterAll(func() {
_ = kubectl.Delete(demoManifest)
kubectl.DeleteCiliumDS()
ExpectAllPodsTerminated(kubectl)
kubectl.CloseSSHClient()
})
Expand Down
2 changes: 0 additions & 2 deletions test/k8sT/hubble.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ var _ = Describe("K8sHubbleTest", func() {
})

AfterAll(func() {
kubectl.Delete(ciliumFilename)
ExpectAllPodsTerminated(kubectl)
kubectl.CloseSSHClient()
})

Expand Down
2 changes: 0 additions & 2 deletions test/k8sT/istio.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ var _ = Describe("K8sIstioTest", func() {
By("Deleting the istio-system namespace")
_ = kubectl.NamespaceDelete(istioSystemNamespace)

kubectl.DeleteCiliumDS()

kubectl.CloseSSHClient()
})

Expand Down

0 comments on commit 5aee704

Please sign in to comment.