Skip to content

Commit e7b9407

Browse files
authored
Merge pull request #2334 from sbueringer/pr-webhook-log-levels
⚠ Change webhook request received / response written logs to log level 4
2 parents 260b822 + babed98 commit e7b9407

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

pkg/webhook/admission/http.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
9393
wh.writeResponse(w, reviewResponse)
9494
return
9595
}
96-
wh.getLogger(&req).V(1).Info("received request")
96+
wh.getLogger(&req).V(4).Info("received request")
9797

9898
reviewResponse = wh.Handle(ctx, req)
9999
wh.writeResponseTyped(w, reviewResponse, actualAdmRevGVK)
@@ -136,11 +136,11 @@ func (wh *Webhook) writeAdmissionResponse(w io.Writer, ar v1.AdmissionReview) {
136136
}
137137
} else {
138138
res := ar.Response
139-
if log := wh.getLogger(nil); log.V(1).Enabled() {
139+
if log := wh.getLogger(nil); log.V(4).Enabled() {
140140
if res.Result != nil {
141141
log = log.WithValues("code", res.Result.Code, "reason", res.Result.Reason, "message", res.Result.Message)
142142
}
143-
log.V(1).Info("wrote response", "requestID", res.UID, "allowed", res.Allowed)
143+
log.V(4).Info("wrote response", "requestID", res.UID, "allowed", res.Allowed)
144144
}
145145
}
146146
}

pkg/webhook/authentication/http.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
8989
ar.SetGroupVersionKind(authenticationv1.SchemeGroupVersion.WithKind("TokenReview"))
9090
_, actualTokRevGVK, err := authenticationCodecs.UniversalDeserializer().Decode(body, nil, &ar)
9191
if err != nil {
92-
wh.getLogger(&req).Error(err, "unable to decode the request")
92+
wh.getLogger(nil).Error(err, "unable to decode the request")
9393
reviewResponse = Errored(err)
9494
wh.writeResponse(w, reviewResponse)
9595
return
9696
}
97-
wh.getLogger(&req).V(1).Info("received request")
97+
wh.getLogger(&req).V(4).Info("received request")
9898

9999
if req.Spec.Token == "" {
100100
err = errors.New("token is empty")
@@ -135,9 +135,7 @@ func (wh *Webhook) writeTokenResponse(w io.Writer, ar authenticationv1.TokenRevi
135135
wh.writeResponse(w, Errored(err))
136136
}
137137
res := ar
138-
if wh.getLogger(nil).V(1).Enabled() {
139-
wh.getLogger(nil).V(1).Info("wrote response", "requestID", res.UID, "authenticated", res.Status.Authenticated)
140-
}
138+
wh.getLogger(nil).V(4).Info("wrote response", "requestID", res.UID, "authenticated", res.Status.Authenticated)
141139
}
142140

143141
// unversionedTokenReview is used to decode both v1 and v1beta1 TokenReview types.

0 commit comments

Comments
 (0)