mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-09 03:57:41 +00:00
resourcequota return StatusError when timeout
This commit is contained in:
parent
481b2dc7cf
commit
5caf141650
@ -32,6 +32,7 @@ go_library(
|
|||||||
"//plugin/pkg/admission/resourcequota/apis/resourcequota/validation:go_default_library",
|
"//plugin/pkg/admission/resourcequota/apis/resourcequota/validation:go_default_library",
|
||||||
"//vendor/github.com/golang/glog:go_default_library",
|
"//vendor/github.com/golang/glog:go_default_library",
|
||||||
"//vendor/github.com/hashicorp/golang-lru:go_default_library",
|
"//vendor/github.com/hashicorp/golang-lru:go_default_library",
|
||||||
|
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
|
||||||
|
@ -25,6 +25,7 @@ import (
|
|||||||
|
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
|
|
||||||
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
"k8s.io/apimachinery/pkg/api/meta"
|
"k8s.io/apimachinery/pkg/api/meta"
|
||||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
||||||
@ -531,7 +532,7 @@ func (e *quotaEvaluator) Evaluate(a admission.Attributes) error {
|
|||||||
evaluator := e.registry.Get(gr)
|
evaluator := e.registry.Get(gr)
|
||||||
if evaluator == nil {
|
if evaluator == nil {
|
||||||
// create an object count evaluator if no evaluator previously registered
|
// create an object count evaluator if no evaluator previously registered
|
||||||
// note, we do not need aggregate usage here, so we pass a nil infomer func
|
// note, we do not need aggregate usage here, so we pass a nil informer func
|
||||||
evaluator = generic.NewObjectCountEvaluator(false, gr, nil, "")
|
evaluator = generic.NewObjectCountEvaluator(false, gr, nil, "")
|
||||||
e.registry.Add(evaluator)
|
e.registry.Add(evaluator)
|
||||||
glog.Infof("quota admission added evaluator for: %s", gr)
|
glog.Infof("quota admission added evaluator for: %s", gr)
|
||||||
@ -549,7 +550,7 @@ func (e *quotaEvaluator) Evaluate(a admission.Attributes) error {
|
|||||||
select {
|
select {
|
||||||
case <-waiter.finished:
|
case <-waiter.finished:
|
||||||
case <-time.After(10 * time.Second):
|
case <-time.After(10 * time.Second):
|
||||||
return fmt.Errorf("timeout")
|
return apierrors.NewInternalError(fmt.Errorf("resource quota evaluates timeout"))
|
||||||
}
|
}
|
||||||
|
|
||||||
return waiter.result
|
return waiter.result
|
||||||
|
Loading…
Reference in New Issue
Block a user