github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #65350 from liggitt/simplify-taint-manager-key

Browse Source 
Simplify taint manager workqueue keys
This commit is contained in:
k8s-ci-robot
2018-10-17 18:39:03 -07:00
committed by GitHub
parent feb6475a30 9503c64f27
commit 6f4b768c94
4 changed files with 138 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/nodelifecycle/node_lifecycle_controller.go
View File

@@ -345,7 +345,11 @@ func NewNodeLifecycleController(
nc.podInformerSynced = podInformer.Informer().HasSynced
if nc.runTaintManager {
nc.taintManager = scheduler.NewNoExecuteTaintManager(kubeClient)
podLister := podInformer.Lister()
podGetter := func(name, namespace string) (*v1.Pod, error) { return podLister.Pods(namespace).Get(name) }
nodeLister := nodeInformer.Lister()
nodeGetter := func(name string) (*v1.Node, error) { return nodeLister.Get(name) }
nc.taintManager = scheduler.NewNoExecuteTaintManager(kubeClient, podGetter, nodeGetter)
nodeInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: nodeutil.CreateAddNodeHandler(func(node *v1.Node) error {
nc.taintManager.NodeUpdated(nil, node)