Skip to content

K
k3s
Commit 4def5add authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46373 from deads2k/controller-06-queue

Automatic merge from submit-queue (batch tested with PRs 45913, 46065, 46352, 46363, 46373) don't queue namespaces for deletion if the namespace isn't deleted Most namespaces aren't deleted most of the time. No need to queue them for cleanup if they aren't deleted.
parents d84f3f4b ba5a1113
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
pkg/controller/namespace/namespace_controller.go
View file @ 4def5add
...@@ -107,6 +107,13 @@ func (nm *NamespaceController) enqueueNamespace(obj interface{}) { ...@@ -107,6 +107,13 @@ func (nm *NamespaceController) enqueueNamespace(obj interface{}) {
utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err)) utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err))
return 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, // 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 // and HA etcd servers to observe last minute object creations inside the namespace
nm.queue.AddAfter(key, namespaceDeletionGracePeriod) nm.queue.AddAfter(key, namespaceDeletionGracePeriod)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment