Merge pull request #65339 from liggitt/taint-manager-memory

Automatic merge from submit-queue (batch tested with PRs 65339, 65343, 65324, 65335, 65367). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Remove item from taint manager workqueue on completion fixes a memory leak observed in the controller manager when creating/deleting pods containing tolerations xref #65325 ```release-note fixes a memory leak in the kube-controller-manager observed when large numbers of pods with tolerations are created/deleted ```

Merge pull request #65339 from liggitt/taint-manager-memory
bece0d52 · Kubernetes Submit Queue · GitHub · e467e9ab · 8448ee4e · bece0d52
Unverified Commit bece0d52 authored Jun 22, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

taint_manager.go pkg/controller/nodelifecycle/scheduler/taint_manager.go +4 -0

No files found.
--- a/pkg/controller/nodelifecycle/scheduler/taint_manager.go
+++ b/pkg/controller/nodelifecycle/scheduler/taint_manager.go
@@ -224,9 +224,11 @@ func (tc *NoExecuteTaintManager) Run(stopCh <-chan struct{}) {
 			hash := hash(nodeUpdate.name())
 			select {
 			case <-stopCh:
+				tc.nodeUpdateQueue.Done(item)
 				break
 			case tc.nodeUpdateChannels[hash%workers] <- nodeUpdate:
 			}
+			tc.nodeUpdateQueue.Done(item)
 		}
 	}(stopCh)

@@ -240,9 +242,11 @@ func (tc *NoExecuteTaintManager) Run(stopCh <-chan struct{}) {
 			hash := hash(podUpdate.nodeName())
 			select {
 			case <-stopCh:
+				tc.podUpdateQueue.Done(item)
 				break
 			case tc.podUpdateChannels[hash%workers] <- podUpdate:
 			}
+			tc.podUpdateQueue.Done(item)
 		}
 	}(stopCh)