github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

node-controller reconcile node labels on each update

Browse Source 
instead of waiting for the periodic loop of the node-controller to
go through all the nodes, use the sync logic to reconcile the node
labels each time that the node has changed after it has been
initialized.

This has the benefit that changes by external entities on this labels
are quickly reconciled.

Change-Id: I45cfc1e3f0b9eefdfdd67267229420d76132ab87
This commit is contained in:
Antonio Ojea 2024-02-17 18:56:14 +00:00
parent 03bd3e25b1
commit 0ab006b8a1
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/cloud-provider/controllers/node/node_controller.go
View File

@ -283,11 +283,6 @@ func (cnc *CloudNodeController) UpdateNodeStatus(ctx context.Context) error {
} }
cnc.updateNodeAddress(ctx, node, instanceMetadata) cnc.updateNodeAddress(ctx, node, instanceMetadata)
err = cnc.reconcileNodeLabels(node.Name)
if err != nil {
klog.Errorf("Error reconciling node labels for node %q, err: %v", node.Name, err)
}
} }
workqueue.ParallelizeUntil(ctx, int(cnc.workerCount), len(nodes), updateNodeFunc) workqueue.ParallelizeUntil(ctx, int(cnc.workerCount), len(nodes), updateNodeFunc)
@ -423,9 +418,8 @@ func (cnc *CloudNodeController) syncNode(ctx context.Context, nodeName string) e
cloudTaint := getCloudTaint(curNode.Spec.Taints) cloudTaint := getCloudTaint(curNode.Spec.Taints)
if cloudTaint == nil { if cloudTaint == nil {
// Node object received from event had the cloud taint but was outdated, // Node object was already initialized, only need to reconcile the labels
// the node has actually already been initialized, so this sync event can be ignored. return cnc.reconcileNodeLabels(nodeName)
return nil
} }
klog.Infof("Initializing node %s with cloud provider", nodeName) klog.Infof("Initializing node %s with cloud provider", nodeName)