Merge pull request #41797 from deads2k/apiserver-14-instrument

Automatic merge from submit-queue (batch tested with PRs 41797, 41793, 41795, 41807, 41781) tweak a list to a watch verb when requested Related to https://github.com/kubernetes/kubernetes/pull/41774 @wojtek-t does this do what's needed?

Merge pull request #41797 from deads2k/apiserver-14-instrument
c6036b6a · Kubernetes Submit Queue · GitHub · c36eee2a · ec91c009 · c6036b6a
Commit c6036b6a authored Feb 22, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

metrics.go ...ing/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go +5 -0

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
@@ -21,6 +21,7 @@ import (
 	"net"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"

 	utilnet "k8s.io/apimachinery/pkg/util/net"
@@ -99,6 +100,10 @@ func InstrumentRouteFunc(verb, resource string, routeFunc restful.RouteFunction)
 		response.ResponseWriter = rw

 		routeFunc(request, response)
+
+		if verb == "LIST" && strings.ToLower(request.QueryParameter("watch")) == "true" {
+			verb = "WATCH"
+		}
 		Monitor(&verb, &resource, utilnet.GetHTTPClient(request.Request), rw.Header().Get("Content-Type"), delegate.status, now)
 	})
 }