Merge pull request #1850 from marquiz/release-0.16

k8s-ci-robot · web-flow · commit 86bf44fd32d8 · 2024-08-20T04:11:26.000-07:00
[release-0.16] 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
@@ -187,7 +187,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() {
@@ -198,7 +201,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
@@ -393,7 +393,7 @@ func (m *nfdMaster) Run() error {
 
 			// Update all nodes when the configuration changes
 			if m.nfdController != nil && nfdfeatures.NFDFeatureGate.Enabled(nfdfeatures.NodeFeatureAPI) && m.args.EnableNodeFeatureApi {
-				m.nfdController.updateAllNodesChan <- struct{}{}
+				m.nfdController.updateAllNodes()
 			}
 
 		case <-m.stop:

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,10 @@ func (c *nfdController) updateOneNode(typ string, obj metav1.Object) {`
`187`	`187`	`klog.ErrorS(err, "failed to determine node name for object", "type", typ, "object", klog.KObj(obj))`
`188`	`188`	`return`
`189`	`189`	`}`
`190`		`- c.updateOneNodeChan <- nodeName`
	`190`	`+ select {`
	`191`	`+ case c.updateOneNodeChan <- nodeName:`
	`192`	`+ case <-c.stopChan:`
	`193`	`+ }`
`191`	`194`	`}`
`192`	`195`
`193`	`196`	`func (c *nfdController) updateAllNodes() {`
`@@ -198,7 +201,10 @@ func (c *nfdController) updateAllNodes() {`
`198`	`201`	`}`
`199`	`202`
`200`	`203`	`func (c *nfdController) updateNodeFeatureGroup(nodeFeatureGroup string) {`
`201`		`- c.updateNodeFeatureGroupChan <- nodeFeatureGroup`
	`204`	`+ select {`
	`205`	`+ case c.updateNodeFeatureGroupChan <- nodeFeatureGroup:`
	`206`	`+ case <-c.stopChan:`
	`207`	`+ }`
`202`	`208`	`}`
`203`	`209`
`204`	`210`	`func (c *nfdController) updateAllNodeFeatureGroups() {`
Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ func (m *nfdMaster) Run() error {`
`393`	`393`
`394`	`394`	`// Update all nodes when the configuration changes`
`395`	`395`	`if m.nfdController != nil && nfdfeatures.NFDFeatureGate.Enabled(nfdfeatures.NodeFeatureAPI) && m.args.EnableNodeFeatureApi {`
`396`		`- m.nfdController.updateAllNodesChan <- struct{}{}`
	`396`	`+ m.nfdController.updateAllNodes()`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`case <-m.stop:`