提交 ea34bda8 编写于 作者: W wanjunlei

fix bug #3226

Signed-off-by: Nwanjunlei <wanjunlei@yunify.com>
上级 d814d5db
......@@ -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()}
}
......
......@@ -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",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册