Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1904133: kubeletcfg: fix repeated status error msg #2369

Merged
merged 1 commit into from Jan 30, 2021
Merged

Bug 1904133: kubeletcfg: fix repeated status error msg #2369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions pkg/controller/kubelet-config/kubelet_config_controller.go
View file
Open in desktop
Expand Up @@ -286,11 +286,6 @@ func (ctrl *Controller) handleErr(err error, key interface{}) {
return
}

if err == errCouldNotFindMCPSet {
ctrl.queue.AddAfter(key, 1*time.Minute)
return
}

if ctrl.queue.NumRequeues(key) < maxRetries {
glog.V(2).Infof("Error syncing kubeletconfig %v: %v", key, err)
ctrl.queue.AddRateLimited(key)
Expand Down Expand Up @@ -349,7 +344,16 @@ func (ctrl *Controller) syncStatusOnly(cfg *mcfgv1.KubeletConfig, err error, arg
if getErr != nil {
return getErr
}
newcfg.Status.Conditions = append(newcfg.Status.Conditions, wrapErrorWithCondition(err, args...))
// To avoid a long list of same statuses, only append a status if it is the first status
// or if the status message is different from the message of the last status recorded
// If the last status message is the same as the new one, then update the last status to
// reflect the latest time stamp from the new status message.
newStatusCondition := wrapErrorWithCondition(err, args...)
if len(newcfg.Status.Conditions) == 0 || newStatusCondition.Message != newcfg.Status.Conditions[len(newcfg.Status.Conditions)-1].Message {
newcfg.Status.Conditions = append(newcfg.Status.Conditions, newStatusCondition)
} else if newcfg.Status.Conditions[len(newcfg.Status.Conditions)-1].Message == newStatusCondition.Message {
newcfg.Status.Conditions[len(newcfg.Status.Conditions)-1] = newStatusCondition
}
_, lerr := ctrl.client.MachineconfigurationV1().KubeletConfigs().UpdateStatus(context.TODO(), newcfg, metav1.UpdateOptions{})
return lerr
})
Expand Down