github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update events' ResponseStatus at Metadata level 

ResponseStatus is populated in MetadataLevel, so we also update it in
MetadataLevel.
pull/6/head
Cao Shufeng 2017-06-30 16:22:08 +08:00
parent 0641386318
commit b6abcacb38
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/apis/audit/types.go
View File

@ -100,8 +100,8 @@ type Event struct {
// +optional // +optional
ObjectRef *ObjectReference ObjectRef *ObjectReference
// The response status, populated even when the ResponseObject is not a Status type. // The response status, populated even when the ResponseObject is not a Status type.
// For successful responses, this will only include the Code and StatusSuccess. // For successful responses, this will only include the Code. For non-status type
// For non-status type error responses, this will be auto-populated with the error Message. // error responses, this will be auto-populated with the error Message.
// +optional // +optional
ResponseStatus *metav1.Status ResponseStatus *metav1.Status

6
staging/src/k8s.io/apiserver/pkg/audit/request.go
View File

@ -170,14 +170,16 @@ func LogRequestPatch(ae *audit.Event, patch []byte) {
// LogResponseObject fills in the response object into an audit event. The passed runtime.Object // LogResponseObject fills in the response object into an audit event. The passed runtime.Object
// will be converted to the given gv. // will be converted to the given gv.
func LogResponseObject(ae *audit.Event, obj runtime.Object, gv schema.GroupVersion, s runtime.NegotiatedSerializer) { func LogResponseObject(ae *audit.Event, obj runtime.Object, gv schema.GroupVersion, s runtime.NegotiatedSerializer) {
if ae == nil || ae.Level.Less(audit.LevelRequestResponse) { if ae == nil || ae.Level.Less(audit.LevelMetadata) {
return return
} }
if status, ok := obj.(*metav1.Status); ok { if status, ok := obj.(*metav1.Status); ok {
ae.ResponseStatus = status ae.ResponseStatus = status
} }
if ae.Level.Less(audit.LevelRequestResponse) {
return
}
// TODO(audit): hook into the serializer to avoid double conversion // TODO(audit): hook into the serializer to avoid double conversion
var err error var err error
ae.ResponseObject, err = encodeObject(obj, gv, s) ae.ResponseObject, err = encodeObject(obj, gv, s)