From 642154a7a3d695af9ae3c38df8754a0774c90407 Mon Sep 17 00:00:00 2001 From: Nick Sardo Date: Thu, 29 Jun 2017 12:05:32 -0700 Subject: [PATCH] Do not fail on error when deleting ingress --- test/e2e/framework/ingress_utils.go | 9 ++++++--- test/e2e/ingress.go | 4 ++-- test/e2e/upgrades/ingress.go | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/test/e2e/framework/ingress_utils.go b/test/e2e/framework/ingress_utils.go index 92d0ef59f0c4..64ab85b2cf8c 100644 --- a/test/e2e/framework/ingress_utils.go +++ b/test/e2e/framework/ingress_utils.go @@ -882,9 +882,12 @@ func (j *IngressTestJig) GetRootCA(secretName string) (rootCA []byte) { return } -// DeleteIngress deletes the ingress resource -func (j *IngressTestJig) DeleteIngress() { - ExpectNoError(j.Client.Extensions().Ingresses(j.Ingress.Namespace).Delete(j.Ingress.Name, nil)) +// TryDeleteIngress attempts to delete the ingress resource and logs errors if they occur. +func (j *IngressTestJig) TryDeleteIngress() { + err := j.Client.Extensions().Ingresses(j.Ingress.Namespace).Delete(j.Ingress.Name, nil) + if err != nil { + Logf("Error while deleting the ingress %v/%v: %v", j.Ingress.Namespace, j.Ingress.Name, err) + } } // WaitForIngress waits till the ingress acquires an IP, then waits for its diff --git a/test/e2e/ingress.go b/test/e2e/ingress.go index b4d3e34943d6..70199d047419 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/ingress.go @@ -89,7 +89,7 @@ var _ = framework.KubeDescribe("Loadbalancing: L7", func() { return } By("Deleting ingress") - jig.DeleteIngress() + jig.TryDeleteIngress() By("Cleaning up cloud resources") framework.CleanupGCEIngressController(gceController) @@ -179,7 +179,7 @@ var _ = framework.KubeDescribe("Loadbalancing: L7", func() { return } By("Deleting ingress") - jig.DeleteIngress() + jig.TryDeleteIngress() }) It("should conform to Ingress spec", func() { diff --git a/test/e2e/upgrades/ingress.go b/test/e2e/upgrades/ingress.go index 1a6ace7e0d04..7ca9e3b7d130 100644 --- a/test/e2e/upgrades/ingress.go +++ b/test/e2e/upgrades/ingress.go @@ -101,7 +101,7 @@ func (t *IngressUpgradeTest) Teardown(f *framework.Framework) { } if t.jig.Ingress != nil { By("Deleting ingress") - t.jig.DeleteIngress() + t.jig.TryDeleteIngress() } else { By("No ingress created, no cleanup necessary") }