Merge pull request #62695 from CaoShuFeng/duplicated_status

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. avoid duplicate status in audit events Fixes: https://github.com/kubernetes/kubernetes/issues/60108 **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: /assign @sttts @tallclair **Release note**: ``` Action required: When Response is a metav1.Status, it is no longer copied into the audit.Event status. Only the "status", "reason" and "code" fields are set. ```

Merge pull request #62695 from CaoShuFeng/duplicated_status
d0f4a8fa · Kubernetes Submit Queue · GitHub · b71966ac · 4d20c38c · d0f4a8fa
Unverified Commit d0f4a8fa authored May 15, 2018 by Kubernetes Submit Queue Committed by GitHub May 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

request.go staging/src/k8s.io/apiserver/pkg/audit/request.go +6 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/audit/request.go
+++ b/staging/src/k8s.io/apiserver/pkg/audit/request.go
@@ -171,7 +171,12 @@ func LogResponseObject(ae *auditinternal.Event, obj runtime.Object, gv schema.Gr
 		return
 	}
 	if status, ok := obj.(*metav1.Status); ok {
-		ae.ResponseStatus = status
+		// selectively copy the bounded fields.
+		ae.ResponseStatus = &metav1.Status{
+			Status: status.Status,
+			Reason: status.Reason,
+			Code:   status.Code,
+		}
 	}

 	if ae.Level.Less(auditinternal.LevelRequestResponse) {