mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2025-03-28 02:37:11 +00:00
Merge pull request #1291 from marquiz/devel/master-renaming
nfd-master: use term node update instead of labeling
This commit is contained in:
commit
6caf554b4c
2 changed files with 4 additions and 5 deletions
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -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,11 +48,11 @@ 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)
|
||||
|
@ -60,7 +60,7 @@ func (u *nodeUpdaterPool) processNodeLabelRequest(queue workqueue.RateLimitingIn
|
|||
}
|
||||
|
||||
func (u *nodeUpdaterPool) runNodeUpdater(queue workqueue.RateLimitingInterface) {
|
||||
for u.processNodeLabelRequest(queue) {
|
||||
for u.processNodeUpdateRequest(queue) {
|
||||
}
|
||||
u.wg.Done()
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue