Merge pull request #989 from databus23/patch-2

k8s-ci-robot · web-flow · commit 1abbd13455ec · 2020-08-04T07:08:22.000-07:00
🐛 Avoid marshalling error in debug log line
diff --git a/pkg/webhook/admission/http.go b/pkg/webhook/admission/http.go
@@ -99,6 +99,11 @@ func (wh *Webhook) writeResponse(w io.Writer, response Response) {
 		wh.writeResponse(w, Errored(http.StatusInternalServerError, err))
 	} else {
 		res := responseAdmissionReview.Response
-		wh.log.V(1).Info("wrote response", "UID", res.UID, "allowed", res.Allowed, "result", res.Result)
+		if log := wh.log; log.V(1).Enabled() {
+			if res.Result != nil {
+				log = log.WithValues("code", res.Result.Code, "reason", res.Result.Reason)
+			}
+			log.V(1).Info("wrote response", "UID", res.UID, "allowed", res.Allowed)
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,11 @@ func (wh *Webhook) writeResponse(w io.Writer, response Response) {`
`99`	`99`	`wh.writeResponse(w, Errored(http.StatusInternalServerError, err))`
`100`	`100`	`} else {`
`101`	`101`	`res := responseAdmissionReview.Response`
`102`		`- wh.log.V(1).Info("wrote response", "UID", res.UID, "allowed", res.Allowed, "result", res.Result)`
	`102`	`+ if log := wh.log; log.V(1).Enabled() {`
	`103`	`+ if res.Result != nil {`
	`104`	`+ log = log.WithValues("code", res.Result.Code, "reason", res.Result.Reason)`
	`105`	`+ }`
	`106`	`+ log.V(1).Info("wrote response", "UID", res.UID, "allowed", res.Allowed)`
	`107`	`+ }`
`103`	`108`	`}`
`104`	`109`	`}`