Merge pull request #1848 from marquiz/devel/leader-elect

k8s-ci-robot · web-flow · commit 4db3216a80ff · 2024-08-20T03:02:44.000-07:00
nfd-master: proper shutdown of nfd api informers
diff --git a/pkg/nfd-master/nfd-api-controller.go b/pkg/nfd-master/nfd-api-controller.go
@@ -206,7 +206,10 @@ func (c *nfdController) updateOneNode(typ string, obj metav1.Object) {
 		klog.ErrorS(err, "failed to determine node name for object", "type", typ, "object", klog.KObj(obj))
 		return
 	}
-	c.updateOneNodeChan <- nodeName
+	select {
+	case c.updateOneNodeChan <- nodeName:
+	case <-c.stopChan:
+	}
 }
 
 func (c *nfdController) updateAllNodes() {
@@ -217,7 +220,10 @@ func (c *nfdController) updateAllNodes() {
 }
 
 func (c *nfdController) updateNodeFeatureGroup(nodeFeatureGroup string) {
-	c.updateNodeFeatureGroupChan <- nodeFeatureGroup
+	select {
+	case c.updateNodeFeatureGroupChan <- nodeFeatureGroup:
+	case <-c.stopChan:
+	}
 }
 
 func (c *nfdController) updateAllNodeFeatureGroups() {
diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go
@@ -392,7 +392,7 @@ func (m *nfdMaster) Run() error {
 
 			// Update all nodes when the configuration changes
 			if m.nfdController != nil && nfdfeatures.NFDFeatureGate.Enabled(nfdfeatures.NodeFeatureAPI) {
-				m.nfdController.updateAllNodesChan <- struct{}{}
+				m.nfdController.updateAllNodes()
 			}
 
 		case <-m.stop:

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,10 @@ func (c *nfdController) updateOneNode(typ string, obj metav1.Object) {`
`206`	`206`	`klog.ErrorS(err, "failed to determine node name for object", "type", typ, "object", klog.KObj(obj))`
`207`	`207`	`return`
`208`	`208`	`}`
`209`		`- c.updateOneNodeChan <- nodeName`
	`209`	`+ select {`
	`210`	`+ case c.updateOneNodeChan <- nodeName:`
	`211`	`+ case <-c.stopChan:`
	`212`	`+ }`
`210`	`213`	`}`
`211`	`214`
`212`	`215`	`func (c *nfdController) updateAllNodes() {`
`@@ -217,7 +220,10 @@ func (c *nfdController) updateAllNodes() {`
`217`	`220`	`}`
`218`	`221`
`219`	`222`	`func (c *nfdController) updateNodeFeatureGroup(nodeFeatureGroup string) {`
`220`		`- c.updateNodeFeatureGroupChan <- nodeFeatureGroup`
	`223`	`+ select {`
	`224`	`+ case c.updateNodeFeatureGroupChan <- nodeFeatureGroup:`
	`225`	`+ case <-c.stopChan:`
	`226`	`+ }`
`221`	`227`	`}`
`222`	`228`
`223`	`229`	`func (c *nfdController) updateAllNodeFeatureGroups() {`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ func (m *nfdMaster) Run() error {`
`392`	`392`
`393`	`393`	`// Update all nodes when the configuration changes`
`394`	`394`	`if m.nfdController != nil && nfdfeatures.NFDFeatureGate.Enabled(nfdfeatures.NodeFeatureAPI) {`
`395`		`- m.nfdController.updateAllNodesChan <- struct{}{}`
	`395`	`+ m.nfdController.updateAllNodes()`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`case <-m.stop:`