Skip to content

[release-4.18] OCPBUGS-61773: UPSTREAM: <carry>: backporting fix for concurrent map iteration and write #2456 #2475

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

Open
wants to merge 4 commits into
base: release-4.18
Choose a base branch
from
Open

[release-4.18] OCPBUGS-61773: UPSTREAM: <carry>: backporting fix for concurrent map iteration and write #2456 #2475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8cdcc5
UPSTREAM: 129472: Fix API server crash on concurrent map iteration an…
sxllwx Oct 23, 2023
81ac17a
UPSTREAM: 131694: Eliminate AuditContext`s SetEventLevel
dims May 9, 2025
17140b9
UPSTREAM: 131725: Avoid encoding in LogResponseObject when we are not…
k8s-ci-robot May 12, 2025
fe126dd
UPSTREAM: <carry>: Fix tests after backport
ricardomaraschini Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/registry/core/serviceaccount/storage/storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func TestCreate_Token_SetsCredentialIDAuditAnnotation(t *testing.T) {
}

auditContext := audit.AuditContextFrom(ctx)
issuedCredentialID, ok := auditContext.Event.Annotations["authentication.kubernetes.io/issued-credential-id"]
issuedCredentialID, ok := auditContext.GetEventAnnotation("authentication.kubernetes.io/issued-credential-id")
if !ok || len(issuedCredentialID) == 0 {
t.Errorf("did not find issued-credential-id in audit event annotations")
}
Expand Down
6 changes: 3 additions & 3 deletions staging/src/k8s.io/apiserver/pkg/admission/audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,17 @@ func ensureAnnotationGetter(a Attributes) error {
}

func (handler *auditHandler) logAnnotations(ctx context.Context, a Attributes) {
ae := audit.AuditEventFrom(ctx)
ae := audit.AuditContextFrom(ctx)
if ae == nil {
return
}

var annotations map[string]string
switch a := a.(type) {
case privateAnnotationsGetter:
annotations = a.getAnnotations(ae.Level)
annotations = a.getAnnotations(ae.GetEventLevel())
case AnnotationsGetter:
annotations = a.GetAnnotations(ae.Level)
annotations = a.GetAnnotations(ae.GetEventLevel())
default:
// this will never happen, because we have already checked it in ensureAnnotationGetter
}
Expand Down
12 changes: 6 additions & 6 deletions staging/src/k8s.io/apiserver/pkg/admission/audit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,10 @@ func TestWithAudit(t *testing.T) {
var handler Interface = fakeHandler{tc.admit, tc.admitAnnotations, tc.validate, tc.validateAnnotations, tc.handles}
ctx := audit.WithAuditContext(context.Background())
ac := audit.AuditContextFrom(ctx)
ae := &ac.Event
ae.Level = auditinternal.LevelMetadata
if err := ac.Init(audit.RequestAuditConfig{Level: auditinternal.LevelMetadata}, nil); err != nil {
t.Fatal(err)
}

auditHandler := WithAudit(handler)
a := attributes()

Expand All @@ -171,9 +173,9 @@ func TestWithAudit(t *testing.T) {
annotations[k] = v
}
if len(annotations) == 0 {
assert.Nil(t, ae.Annotations, tcName+": unexptected annotations set in audit event")
assert.Nil(t, ac.GetEventAnnotations(), tcName+": unexptected annotations set in audit event")
} else {
assert.Equal(t, annotations, ae.Annotations, tcName+": unexptected annotations set in audit event")
assert.Equal(t, annotations, ac.GetEventAnnotations(), tcName+": unexptected annotations set in audit event")
}
}
}
Expand All @@ -187,8 +189,6 @@ func TestWithAuditConcurrency(t *testing.T) {
}
var handler Interface = fakeHandler{admitAnnotations: admitAnnotations, handles: true}
ctx := audit.WithAuditContext(context.Background())
ac := audit.AuditContextFrom(ctx)
ac.Event.Level = auditinternal.LevelMetadata
auditHandler := WithAudit(handler)
a := attributes()

Expand Down
Loading