From 5aee7040b077703d6f218c4ddd91ec54a4c79fef Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 20 May 2020 08:34:41 +0200 Subject: [PATCH] test: Don't delete and redeploy Cilium at end of each test context There is no point in doing this. Each test context will deploy Cilium in BeforeAll() with the required configuration. Signed-off-by: Thomas Graf --- test/k8sT/Chaos.go | 2 -- test/k8sT/Conformance.go | 2 -- test/k8sT/DatapathConfiguration.go | 3 --- test/k8sT/Health.go | 2 -- test/k8sT/Identity.go | 6 ------ test/k8sT/KafkaPolicies.go | 2 -- test/k8sT/Policies.go | 2 -- test/k8sT/Services.go | 2 -- test/k8sT/demos.go | 2 -- test/k8sT/external_ips.go | 2 -- test/k8sT/fqdn.go | 1 - test/k8sT/hubble.go | 2 -- test/k8sT/istio.go | 2 -- 13 files changed, 30 deletions(-) diff --git a/test/k8sT/Chaos.go b/test/k8sT/Chaos.go index 6e0268de0df22..8ff28790e9174 100644 --- a/test/k8sT/Chaos.go +++ b/test/k8sT/Chaos.go @@ -51,8 +51,6 @@ var _ = Describe("K8sChaosTest", func() { }) AfterAll(func() { - kubectl.DeleteCiliumDS() - ExpectAllPodsTerminated(kubectl) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/Conformance.go b/test/k8sT/Conformance.go index 5f52e2d75f80b..2fe5177b87858 100644 --- a/test/k8sT/Conformance.go +++ b/test/k8sT/Conformance.go @@ -34,7 +34,6 @@ var _ = Describe("K8sConformance", func() { AfterEach(func() { kubectl.Delete(connectivityCheckYaml) - kubectl.DeleteCiliumDS() ExpectAllPodsTerminated(kubectl) }) @@ -44,7 +43,6 @@ var _ = Describe("K8sConformance", func() { }) AfterAll(func() { - DeployCiliumAndDNS(kubectl, ciliumFilename) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/DatapathConfiguration.go b/test/k8sT/DatapathConfiguration.go index 9b88a14844a90..8a0a1afb21532 100644 --- a/test/k8sT/DatapathConfiguration.go +++ b/test/k8sT/DatapathConfiguration.go @@ -45,8 +45,6 @@ var _ = Describe("K8sDatapathConfig", func() { AfterEach(func() { deploymentManager.DeleteAll() - // FIXME(tgraf) Is this really needed? - deploymentManager.DeleteCilium() }) AfterFailed(func() { @@ -56,7 +54,6 @@ var _ = Describe("K8sDatapathConfig", func() { }) AfterAll(func() { - DeployCiliumAndDNS(kubectl, helpers.TimestampFilename("cilium.yaml")) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/Health.go b/test/k8sT/Health.go index 261e0708f4427..d7c6bdecfb910 100644 --- a/test/k8sT/Health.go +++ b/test/k8sT/Health.go @@ -51,8 +51,6 @@ var _ = Describe("K8sHealthTest", func() { }) AfterAll(func() { - kubectl.DeleteCiliumDS() - ExpectAllPodsTerminated(kubectl) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/Identity.go b/test/k8sT/Identity.go index 3256f7882f863..2aa8bee75deb0 100644 --- a/test/k8sT/Identity.go +++ b/test/k8sT/Identity.go @@ -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() }) diff --git a/test/k8sT/KafkaPolicies.go b/test/k8sT/KafkaPolicies.go index e8a6b6f8e45ac..f64943ce26c26 100644 --- a/test/k8sT/KafkaPolicies.go +++ b/test/k8sT/KafkaPolicies.go @@ -62,8 +62,6 @@ var _ = Describe("K8sKafkaPolicyTest", func() { }) AfterAll(func() { - kubectl.DeleteCiliumDS() - ExpectAllPodsTerminated(kubectl) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/Policies.go b/test/k8sT/Policies.go index 1cb349645d7bc..a3812ee87deda 100644 --- a/test/k8sT/Policies.go +++ b/test/k8sT/Policies.go @@ -113,8 +113,6 @@ var _ = Describe("K8sPolicyTest", func() { }) AfterAll(func() { - kubectl.DeleteCiliumDS() - ExpectAllPodsTerminated(kubectl) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/Services.go b/test/k8sT/Services.go index d080e1d5e6cd9..269c58edcd7ef 100644 --- a/test/k8sT/Services.go +++ b/test/k8sT/Services.go @@ -88,8 +88,6 @@ var _ = Describe("K8sServicesTest", func() { }) AfterAll(func() { - kubectl.DeleteCiliumDS() - ExpectAllPodsTerminated(kubectl) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/demos.go b/test/k8sT/demos.go index c0e1bf7ba2d6e..2f3266d17764f 100644 --- a/test/k8sT/demos.go +++ b/test/k8sT/demos.go @@ -82,8 +82,6 @@ var _ = Describe("K8sDemosTest", func() { }) AfterAll(func() { - kubectl.DeleteCiliumDS() - ExpectAllPodsTerminated(kubectl) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/external_ips.go b/test/k8sT/external_ips.go index e4254e3ac6fdb..6e21a1fb2bfea 100644 --- a/test/k8sT/external_ips.go +++ b/test/k8sT/external_ips.go @@ -185,8 +185,6 @@ var _ = Describe("K8sKubeProxyFreeMatrix tests", func() { return } _ = kubectl.NamespaceDelete(namespaceTest) - kubectl.DeleteCiliumDS() - ExpectAllPodsTerminated(kubectl) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/fqdn.go b/test/k8sT/fqdn.go index 25d9a4679c4b2..f2dd9e85848a3 100644 --- a/test/k8sT/fqdn.go +++ b/test/k8sT/fqdn.go @@ -90,7 +90,6 @@ var _ = Describe("K8sFQDNTest", func() { AfterAll(func() { _ = kubectl.Delete(demoManifest) - kubectl.DeleteCiliumDS() ExpectAllPodsTerminated(kubectl) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/hubble.go b/test/k8sT/hubble.go index 455b70a3ef182..333f1e9a3dade 100644 --- a/test/k8sT/hubble.go +++ b/test/k8sT/hubble.go @@ -121,8 +121,6 @@ var _ = Describe("K8sHubbleTest", func() { }) AfterAll(func() { - kubectl.Delete(ciliumFilename) - ExpectAllPodsTerminated(kubectl) kubectl.CloseSSHClient() }) diff --git a/test/k8sT/istio.go b/test/k8sT/istio.go index d21c285be9098..8c449bc74dca0 100644 --- a/test/k8sT/istio.go +++ b/test/k8sT/istio.go @@ -111,8 +111,6 @@ var _ = Describe("K8sIstioTest", func() { By("Deleting the istio-system namespace") _ = kubectl.NamespaceDelete(istioSystemNamespace) - kubectl.DeleteCiliumDS() - kubectl.CloseSSHClient() })