scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 11:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

This PR refactors taint_manager to eliminate the getPod and getNode stubs.

Browse Source
This commit is contained in:
Michal Wozniak
2022-07-14 18:00:44 +02:00
parent 27110bd821
commit 4ec8cf08da
3 changed files with 45 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -475,12 +475,10 @@ func NewNodeLifecycleController(
return pods, nil
}
nc.podLister = podInformer.Lister()
nc.nodeLister = nodeInformer.Lister()
if nc.runTaintManager {
podGetter := func(name, namespace string) (*v1.Pod, error) { return nc.podLister.Pods(namespace).Get(name) }
nodeLister := nodeInformer.Lister()
nodeGetter := func(name string) (*v1.Node, error) { return nodeLister.Get(name) }
nc.taintManager = scheduler.NewNoExecuteTaintManager(ctx, kubeClient, podGetter, nodeGetter, nc.getPodsAssignedToNode)
nc.taintManager = scheduler.NewNoExecuteTaintManager(ctx, kubeClient, nc.podLister, nc.nodeLister, nc.getPodsAssignedToNode)
nodeInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: controllerutil.CreateAddNodeHandler(func(node *v1.Node) error {
nc.taintManager.NodeUpdated(nil, node)
@@ -518,7 +516,6 @@ func NewNodeLifecycleController(
nc.leaseLister = leaseInformer.Lister()
nc.leaseInformerSynced = leaseInformer.Informer().HasSynced
nc.nodeLister = nodeInformer.Lister()
nc.nodeInformerSynced = nodeInformer.Informer().HasSynced
nc.daemonSetStore = daemonSetInformer.Lister()