github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109181 from liggitt/auditing-disabled-errors

Browse Source 
Avoid log spam in servers without auditing enabled
This commit is contained in:
Kubernetes Prow Robot 2022-03-31 02:21:00 -07:00 committed by GitHub
commit 7d485da326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/apiserver/pkg/audit/context.go
View File

@ -18,7 +18,6 @@ package audit
import ( import (
"context" "context"
"fmt"
"sync" "sync"
auditinternal "k8s.io/apiserver/pkg/apis/audit" auditinternal "k8s.io/apiserver/pkg/apis/audit"
@ -73,7 +72,7 @@ func WithAuditAnnotations(parent context.Context) context.Context {
func AddAuditAnnotation(ctx context.Context, key, value string) { func AddAuditAnnotation(ctx context.Context, key, value string) {
mutex, ok := auditAnnotationsMutex(ctx) mutex, ok := auditAnnotationsMutex(ctx)
if !ok { if !ok {
klog.ErrorS(nil, "Attempted to add audit annotations from unsupported request chain", "annotation", fmt.Sprintf("%s=%s", key, value)) // auditing is not enabled
return return
} }
@ -95,7 +94,7 @@ func AddAuditAnnotation(ctx context.Context, key, value string) {
func AddAuditAnnotations(ctx context.Context, keysAndValues ...string) { func AddAuditAnnotations(ctx context.Context, keysAndValues ...string) {
mutex, ok := auditAnnotationsMutex(ctx) mutex, ok := auditAnnotationsMutex(ctx)
if !ok { if !ok {
klog.ErrorS(nil, "Attempted to add audit annotations from unsupported request chain", "annotations", keysAndValues) // auditing is not enabled
return return
} }
@ -121,7 +120,7 @@ func AddAuditAnnotations(ctx context.Context, keysAndValues ...string) {
func AddAuditAnnotationsMap(ctx context.Context, annotations map[string]string) { func AddAuditAnnotationsMap(ctx context.Context, annotations map[string]string) {
mutex, ok := auditAnnotationsMutex(ctx) mutex, ok := auditAnnotationsMutex(ctx)
if !ok { if !ok {
klog.ErrorS(nil, "Attempted to add audit annotations from unsupported request chain", "annotations", annotations) // auditing is not enabled
return return
} }
@ -154,7 +153,7 @@ func addAuditAnnotationLocked(ae *auditinternal.Event, annotations *[]annotation
func addAuditAnnotationsFrom(ctx context.Context, ev *auditinternal.Event) { func addAuditAnnotationsFrom(ctx context.Context, ev *auditinternal.Event) {
mutex, ok := auditAnnotationsMutex(ctx) mutex, ok := auditAnnotationsMutex(ctx)
if !ok { if !ok {
klog.Errorf("Attempted to copy audit annotations from unsupported request chain") // auditing is not enabled
return return
} }