Merge pull request #1291 from marquiz/devel/master-renaming

nfd-master: use term node update instead of labeling
kubernetes-sigs · Aug 4, 2023 · 6caf554 · 6caf554
2 parents 35fbbaa + 039378c
commit 6caf554
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go
@@ -821,7 +821,6 @@ func filterExtendedResource(name, value string, features *nfdv1alpha1.Features)
 }
 
 func (m *nfdMaster) refreshNodeFeatures(cli *kubernetes.Clientset, nodeName string, annotations Annotations, labels map[string]string, features *nfdv1alpha1.Features) error {
-
 	if labels == nil {
 		labels = make(map[string]string)
 	}

diff --git a/pkg/nfd-master/node-updater-pool.go b/pkg/nfd-master/node-updater-pool.go
@@ -38,7 +38,7 @@ func newNodeUpdaterPool(nfdMaster *nfdMaster) *nodeUpdaterPool {
 	}
 }
 
-func (u *nodeUpdaterPool) processNodeLabelRequest(queue workqueue.RateLimitingInterface) bool {
+func (u *nodeUpdaterPool) processNodeUpdateRequest(queue workqueue.RateLimitingInterface) bool {
 	nodeName, quit := queue.Get()
 	if quit {
 		return false
@@ -48,19 +48,19 @@ func (u *nodeUpdaterPool) processNodeLabelRequest(queue workqueue.RateLimitingIn
 
 	if err := u.nfdMaster.nfdAPIUpdateOneNode(nodeName.(string)); err != nil {
 		if queue.NumRequeues(nodeName) < 5 {
-			klog.InfoS("retrying labeling request for node", "nodeName", nodeName)
+			klog.InfoS("retrying node update", "nodeName", nodeName)
 			queue.AddRateLimited(nodeName)
 			return true
 		} else {
-			klog.ErrorS(err, "error labeling node", "nodeName", nodeName)
+			klog.ErrorS(err, "failed to update node", "nodeName", nodeName)
 		}
 	}
 	queue.Forget(nodeName)
 	return true
 }
 
 func (u *nodeUpdaterPool) runNodeUpdater(queue workqueue.RateLimitingInterface) {
-	for u.processNodeLabelRequest(queue) {
+	for u.processNodeUpdateRequest(queue) {
 	}
 	u.wg.Done()
 }