From ea34bda865ba886fbd0ffc2b86916928482f0b34 Mon Sep 17 00:00:00 2001 From: wanjunlei Date: Fri, 25 Dec 2020 11:39:10 +0800 Subject: [PATCH] fix bug #3226 Signed-off-by: wanjunlei --- pkg/apiserver/auditing/types.go | 10 ++++++---- pkg/apiserver/auditing/types_test.go | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/apiserver/auditing/types.go b/pkg/apiserver/auditing/types.go index d6dd0b08..5e8eb947 100644 --- a/pkg/apiserver/auditing/types.go +++ b/pkg/apiserver/auditing/types.go @@ -23,7 +23,8 @@ import ( "fmt" "github.com/google/uuid" "io/ioutil" - "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/api/authentication/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apiserver/pkg/apis/audit" @@ -139,7 +140,7 @@ func (a *auditing) LogRequestObject(req *http.Request, info *request.RequestInfo Stage: audit.StageResponseComplete, ImpersonatedUser: nil, UserAgent: req.UserAgent(), - RequestReceivedTimestamp: v1.NowMicro(), + RequestReceivedTimestamp: metav1.NowMicro(), Annotations: nil, ObjectRef: &audit.ObjectReference{ Resource: info.Resource, @@ -183,6 +184,7 @@ func (a *auditing) LogRequestObject(req *http.Request, info *request.RequestInfo e.User.UID = user.GetUID() e.User.Groups = user.GetGroups() + e.User.Extra = make(map[string]v1.ExtraValue) for k, v := range user.GetExtra() { e.User.Extra[k] = v } @@ -215,8 +217,8 @@ func (a *auditing) LogRequestObject(req *http.Request, info *request.RequestInfo func (a *auditing) LogResponseObject(e *auditv1alpha1.Event, resp *ResponseCapture) { - e.StageTimestamp = v1.NowMicro() - e.ResponseStatus = &v1.Status{Code: int32(resp.StatusCode())} + e.StageTimestamp = metav1.NowMicro() + e.ResponseStatus = &metav1.Status{Code: int32(resp.StatusCode())} if e.Level.GreaterOrEqual(audit.LevelRequestResponse) { e.ResponseObject = &runtime.Unknown{Raw: resp.Bytes()} } diff --git a/pkg/apiserver/auditing/types_test.go b/pkg/apiserver/auditing/types_test.go index b054ce37..d56affd1 100644 --- a/pkg/apiserver/auditing/types_test.go +++ b/pkg/apiserver/auditing/types_test.go @@ -197,6 +197,7 @@ func TestAuditing_LogRequestObject(t *testing.T) { Groups: []string{ "system", }, + Extra: make(map[string]v1.ExtraValue), }, SourceIPs: []string{ "192.168.0.2", -- GitLab