From ba5a1113e6df062280b6408055c32eb65b652158 Mon Sep 17 00:00:00 2001
From: deads2k <deads@redhat.com>
Date: Wed, 24 May 2017 14:47:53 -0400
Subject: [PATCH] don't queue namespaces for deletion if the namespace isn't
 deleted

---
 pkg/controller/namespace/namespace_controller.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go
index e3373dd018e..dab47230784 100644
--- a/pkg/controller/namespace/namespace_controller.go
+++ b/pkg/controller/namespace/namespace_controller.go
@@ -107,6 +107,13 @@ func (nm *NamespaceController) enqueueNamespace(obj interface{}) {
 		utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err))
 		return
 	}
+
+	namespace := obj.(*v1.Namespace)
+	// don't queue if we aren't deleted
+	if namespace.DeletionTimestamp == nil || namespace.DeletionTimestamp.IsZero() {
+		return
+	}
+
 	// delay processing namespace events to allow HA api servers to observe namespace deletion,
 	// and HA etcd servers to observe last minute object creations inside the namespace
 	nm.queue.AddAfter(key, namespaceDeletionGracePeriod)