upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-09 00:34:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #110607 from prasita123/automated-cherry-pick-of-#110469-upstream-release-1.21

Browse source 
Automated cherry pick of #110469: add missing error handling steps
This commit is contained in:
Kubernetes Prow Robot 2022-06-29 22:22:08 -07:00 committed by GitHub
commit 2fef630dd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
staging/src/k8s.io/cloud-provider/controllers/node/node_controller.go
View file

@ -160,7 +160,12 @@ func (cnc *CloudNodeController) Run(stopCh <-chan struct{}) {
// The periodic loop for updateNodeStatus communicates with the APIServer with a worst case complexity
// of O(num_nodes) per cycle. These functions are justified here because these events fire
// very infrequently. DO NOT MODIFY this to perform frequent operations.
go wait.Until(func() { cnc.UpdateNodeStatus(context.TODO()) }, cnc.nodeStatusUpdateFrequency, stopCh)
go wait.Until(func() {
if err := cnc.UpdateNodeStatus(context.TODO()); err != nil {
klog.Errorf("failed to update node status: %v", err)
}
}, cnc.nodeStatusUpdateFrequency, stopCh)
go wait.Until(cnc.runWorker, time.Second, stopCh)
<-stopCh

8
staging/src/k8s.io/cloud-provider/controllers/route/route_controller.go
View file

@ -267,7 +267,9 @@ func (rc *RouteController) reconcile(nodes []*v1.Node, routes []*cloudprovider.R
go func(n *v1.Node) {
defer wg.Done()
klog.Infof("node %v has no routes assigned to it. NodeNetworkUnavailable will be set to true", n.Name)
rc.updateNetworkingCondition(n, false)
if err := rc.updateNetworkingCondition(n, false); err != nil {
klog.Errorf("failed to update networking condition when no nodeRoutes: %v", err)
}
}(node)
continue
}
@ -281,7 +283,9 @@ func (rc *RouteController) reconcile(nodes []*v1.Node, routes []*cloudprovider.R
}
go func(n *v1.Node) {
defer wg.Done()
rc.updateNetworkingCondition(n, allRoutesCreated)
if err := rc.updateNetworkingCondition(n, allRoutesCreated); err != nil {
klog.Errorf("failed to update networking condition: %v", err)
}
}(node)
}
wg.Wait()