github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100254 from tkashem/apf-post-start-hook-handle-error

Browse Source 
apf PostStartHook: handle error from PollImmediateUntil
This commit is contained in:
Kubernetes Prow Robot 2021-03-23 12:09:36 -07:00 committed by GitHub
commit 42261726ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/registry/flowcontrol/rest/storage_flowcontrol.go
View File

@ -105,7 +105,7 @@ func (p RESTStorageProvider) PostStartHook() (string, genericapiserver.PostStart
flowcontrolClientSet := flowcontrolclient.NewForConfigOrDie(hookContext.LoopbackClientConfig) flowcontrolClientSet := flowcontrolclient.NewForConfigOrDie(hookContext.LoopbackClientConfig)
go func() { go func() {
const retryCreatingSuggestedSettingsInterval = time.Second const retryCreatingSuggestedSettingsInterval = time.Second
_ = wait.PollImmediateUntil( err := wait.PollImmediateUntil(
retryCreatingSuggestedSettingsInterval, retryCreatingSuggestedSettingsInterval,
func() (bool, error) { func() (bool, error) {
should, err := shouldEnsureSuggested(flowcontrolClientSet) should, err := shouldEnsureSuggested(flowcontrolClientSet)
@ -127,6 +127,17 @@ func (p RESTStorageProvider) PostStartHook() (string, genericapiserver.PostStart
return true, nil return true, nil
}, },
hookContext.StopCh) hookContext.StopCh)
if err != nil {
klog.ErrorS(err, "Ensuring suggested configuration failed")
// We should not attempt creation of mandatory objects if ensuring the suggested
// configuration resulted in an error.
// This only happens when the stop channel is closed.
// We rely on the presence of the "exempt" priority level configuration object in the cluster
// to indicate whether we should ensure suggested configuration.
return
}
const retryCreatingMandatorySettingsInterval = time.Minute const retryCreatingMandatorySettingsInterval = time.Minute
_ = wait.PollImmediateUntil( _ = wait.PollImmediateUntil(
retryCreatingMandatorySettingsInterval, retryCreatingMandatorySettingsInterval,
@ -134,7 +145,7 @@ func (p RESTStorageProvider) PostStartHook() (string, genericapiserver.PostStart
if err := upgrade( if err := upgrade(
flowcontrolClientSet, flowcontrolClientSet,
flowcontrolbootstrap.MandatoryFlowSchemas, flowcontrolbootstrap.MandatoryFlowSchemas,
// Note: the "exempt" priority-level is supposed tobe the last item in the pre-defined // Note: the "exempt" priority-level is supposed to be the last item in the pre-defined
// list, so that a crash in the midst of the first kube-apiserver startup does not prevent // list, so that a crash in the midst of the first kube-apiserver startup does not prevent
// the full initial set of objects from being created. // the full initial set of objects from being created.
flowcontrolbootstrap.MandatoryPriorityLevelConfigurations, flowcontrolbootstrap.MandatoryPriorityLevelConfigurations,