mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 09:22:44 +00:00
sarapprover: ignore authz errors
This commit is contained in:
parent
8823a83565
commit
302fe7c0c8
@ -15,6 +15,7 @@ go_library(
|
|||||||
deps = [
|
deps = [
|
||||||
"//pkg/controller:go_default_library",
|
"//pkg/controller:go_default_library",
|
||||||
"//vendor/github.com/golang/glog:go_default_library",
|
"//vendor/github.com/golang/glog:go_default_library",
|
||||||
|
"//vendor/github.com/juju/ratelimit:go_default_library",
|
||||||
"//vendor/k8s.io/api/certificates/v1beta1:go_default_library",
|
"//vendor/k8s.io/api/certificates/v1beta1:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
|
||||||
|
@ -115,7 +115,7 @@ func (a *sarApprover) handle(csr *capi.CertificateSigningRequest) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(tried) != 0 {
|
if len(tried) != 0 {
|
||||||
return fmt.Errorf("recognized csr %q as %v but subject access review was not approved", csr.Name, tried)
|
return certificates.IgnorableError("recognized csr %q as %v but subject access review was not approved", csr.Name, tried)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -135,7 +135,11 @@ func (cc *CertificateController) processNextWorkItem() bool {
|
|||||||
|
|
||||||
if err := cc.syncFunc(cKey.(string)); err != nil {
|
if err := cc.syncFunc(cKey.(string)); err != nil {
|
||||||
cc.queue.AddRateLimited(cKey)
|
cc.queue.AddRateLimited(cKey)
|
||||||
utilruntime.HandleError(fmt.Errorf("Sync %v failed with : %v", cKey, err))
|
if _, ignorable := err.(ignorableError); !ignorable {
|
||||||
|
utilruntime.HandleError(fmt.Errorf("Sync %v failed with : %v", cKey, err))
|
||||||
|
} else {
|
||||||
|
glog.V(4).Infof("Sync %v failed with : %v", cKey, err)
|
||||||
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -181,3 +185,17 @@ func (cc *CertificateController) syncFunc(key string) error {
|
|||||||
|
|
||||||
return cc.handler(csr)
|
return cc.handler(csr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IgnorableError returns an error that we shouldn't handle (i.e. log) because
|
||||||
|
// it's spammy and usually user error. Instead we will log these errors at a
|
||||||
|
// higher log level. We still need to throw these errors to signal that the
|
||||||
|
// sync should be retried.
|
||||||
|
func IgnorableError(s string, args ...interface{}) ignorableError {
|
||||||
|
return ignorableError(fmt.Sprintf(s, args...))
|
||||||
|
}
|
||||||
|
|
||||||
|
type ignorableError string
|
||||||
|
|
||||||
|
func (e ignorableError) Error() string {
|
||||||
|
return string(e)
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user