Skip to content

Bug 1834895: pkg/daemon: Set AddFunc on the nodeInformer as well #1731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
May 14, 2020
Merged

Bug 1834895: pkg/daemon: Set AddFunc on the nodeInformer as well #1731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ type Daemon struct {
// channel used to ensure all spawned goroutines exit when we exit.
stopCh <-chan struct{}

// node is the current instance of the node being processed through handleNodeUpdate
// node is the current instance of the node being processed through handleNodeEvent
// or the very first instance grabbed when the daemon starts
node *corev1.Node

Expand Down Expand Up @@ -278,7 +278,8 @@ func (dn *Daemon) ClusterConnect(
go dn.runLoginMonitor(dn.stopCh, dn.exitCh)

nodeInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
UpdateFunc: dn.handleNodeUpdate,
AddFunc: dn.handleNodeEvent,
UpdateFunc: func(oldObj, newObj interface{}) { dn.handleNodeEvent(newObj) },
})
dn.nodeLister = nodeInformer.Lister()
dn.nodeListerSynced = nodeInformer.Informer().HasSynced
Expand Down Expand Up @@ -1112,12 +1113,11 @@ func (dn *Daemon) runOnceFromIgnition(ignConfig igntypes.Config) error {
return dn.reboot("runOnceFromIgnition complete")
}

func (dn *Daemon) handleNodeUpdate(old, cur interface{}) {
oldNode := old.(*corev1.Node)
curNode := cur.(*corev1.Node)
func (dn *Daemon) handleNodeEvent(node interface{}) {
n := node.(*corev1.Node)

glog.V(4).Infof("Updating Node %s", oldNode.Name)
dn.enqueueNode(curNode)
glog.V(4).Infof("Updating Node %s", n.Name)
dn.enqueueNode(n)
}

// prepUpdateFromCluster handles the shared update prepping functionality for
Expand Down