Improve logging

Author: anthonyho007

pkg/webhook/admission/http.go

@@ -48,7 +48,7 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	var reviewResponse Response
 	if r.Body != nil {
 		if body, err = ioutil.ReadAll(r.Body); err != nil {
-			wh.log.Error(err, "unable to read the body from the incoming request")
+			wh.log.Error(err, "unable to read the body from the incoming request", "request", r)
 			reviewResponse = Errored(http.StatusBadRequest, err)
 			wh.writeResponse(w, reviewResponse)
 			return
@@ -95,7 +95,9 @@ func (wh *Webhook) writeResponse(w io.Writer, response Response) {
 	}
 	err := encoder.Encode(responseAdmissionReview)
 	if err != nil {
-		wh.log.Error(err, "unable to encode the response")
+		wh.log.Error(err, "unable to encode the response", "response", responseAdmissionReview)
 		wh.writeResponse(w, Errored(http.StatusInternalServerError, err))
+	} else {
+		wh.log.V(1).Info("wrote response", "admission response", responseAdmissionReview)
 	}
 }

pkg/webhook/admission/http_test.go

@@ -29,6 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
 
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
+	logf "sigs.k8s.io/controller-runtime/pkg/internal/log"
 )
 
 var _ = Describe("Admission Webhooks", func() {
@@ -87,6 +88,7 @@ var _ = Describe("Admission Webhooks", func() {
 			}
 			webhook := &Webhook{
 				Handler: &fakeHandler{},
+				log:     logf.RuntimeLog.WithName("webhook"),
 			}
 
 			expected := []byte(`{"response":{"uid":"","allowed":true,"status":{"metadata":{},"code":200}}}

pkg/webhook/server.go

@@ -106,6 +106,7 @@ func (s *Server) Register(path string, hook http.Handler) {
 	// TODO(directxman12): call setfields if we've already started the server
 	s.webhooks[path] = hook
 	s.WebhookMux.Handle(path, instrumentedHook(path, hook))
+	log.Info("registering webhook", "path", path)
 }
 
 // instrumentedHook adds some instrumentation on top of the given webhook.
@@ -125,6 +126,8 @@ func (s *Server) Start(stop <-chan struct{}) error {
 	s.defaultingOnce.Do(s.setDefaults)
 
 	baseHookLog := log.WithName("webhooks")
+	baseHookLog.Info("starting webhook server")
+
 	// inject fields here as opposed to in Register so that we're certain to have our setFields
 	// function available.
 	for hookPath, webhook := range s.webhooks {
@@ -164,13 +167,16 @@ func (s *Server) Start(stop <-chan struct{}) error {
 		return err
 	}
 
+	log.Info("serving webhook server", "host", s.Host, "port", s.Port)
+
 	srv := &http.Server{
 		Handler: s.WebhookMux,
 	}
 
 	idleConnsClosed := make(chan struct{})
 	go func() {
 		<-stop
+		log.Info("shutting down webhook server")
 
 		// TODO: use a context with reasonable timeout
 		if err := srv.Shutdown(context.Background()); err != nil {