Skip to content

K
k3s
Commit dca0b2a7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #37846 from sjenning/no-abort-node-status-update

Automatic merge from submit-queue error in setNodeStatus func should not abort node status update `setNodeStatus()` currently errors out if any of the functions in the `kl.setNodeStatusFuncs` returns an error, resulting in the node not reporting status and eventually being marked as `NotReady`. `setNodeAddress()` is currently the only function in `defaultNodeStatusFuncs()` that can return an error and it does if the cloud provider can't be contacted for any number of reasons like token expiration, API outage, ratelimit block, etc. This PR changes `setNodeStatus()` to log, rather than return, when an error is returned by one of the `setNodeStatusFuncs` so that the node status update can proceed. Fixes #34455 xref https://bugzilla.redhat.com/show_bug.cgi?id=1400574 @eparis @derekwaynecarr @mikedanese @anguslees
parents 492f8d41 a40b15d8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
pkg/kubelet/kubelet_node_status.go
View file @ dca0b2a7
......@@ -299,9 +299,7 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) {
}
}
}
if err := kl.setNodeStatus(node); err != nil {
return nil, err
}
kl.setNodeStatus(node)
return node, nil
}
......@@ -375,9 +373,7 @@ func (kl *Kubelet) tryUpdateNodeStatus(tryNumber int) error {
kl.updatePodCIDR(node.Spec.PodCIDR)
if err := kl.setNodeStatus(node); err != nil {
return err
}
kl.setNodeStatus(node)
// Patch the current status on the API server
updatedNode, err := nodeutil.PatchNodeStatus(kl.kubeClient, types.NodeName(kl.nodeName), originalNode, node)
if err != nil {
......@@ -902,13 +898,12 @@ func (kl *Kubelet) setNodeVolumesInUseStatus(node *v1.Node) {
// any fields that are currently set.
// TODO(madhusudancs): Simplify the logic for setting node conditions and
// refactor the node status condition code out to a different file.
func (kl *Kubelet) setNodeStatus(node *v1.Node) error {
func (kl *Kubelet) setNodeStatus(node *v1.Node) {
for _, f := range kl.setNodeStatusFuncs {
if err := f(node); err != nil {
return err
glog.Warningf("Failed to set some node status fields: %s", err)
}
}
return nil
}
// defaultNodeStatusFuncs is a factory that generates the default set of
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment