Merge pull request #44421 from mml/windows

Automatic merge from submit-queue (batch tested with PRs 44362, 44421, 44468, 43878, 44480) Drop leading path of KUBECTL.EXE if it shows up in User-Agent. Partial fix for #44419 Release note: kube-apiserver now drops unneeded path information if an older version of Windows kubectl sends it.

Merge pull request #44421 from mml/windows
079dc0d7 · Kubernetes Submit Queue · GitHub · d1a6090b · 4cff7c3d · 079dc0d7
Commit 079dc0d7 authored Apr 14, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

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

metrics_test.go ...rc/k8s.io/apiserver/pkg/endpoints/metrics/metrics_test.go +8 -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
@@ -109,9 +109,14 @@ func InstrumentRouteFunc(verb, resource string, routeFunc restful.RouteFunction)
 }

 func cleanUserAgent(ua string) string {
+	// We collapse all "web browser"-type user agents into one "browser" to reduce metric cardinality.
 	if strings.HasPrefix(ua, "Mozilla/") {
 		return "Browser"
 	}
+	// If an old "kubectl.exe" has passed us its full path, we discard the path portion.
+	if exeIdx := strings.LastIndex(strings.ToLower(ua), "kubectl.exe"); exeIdx != -1 {
+		return ua[exeIdx:]
+	}
 	return ua
 }


--- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics_test.go
@@ -31,6 +31,14 @@ func TestCleanUserAgent(t *testing.T) {
 			In:  "kubectl/v1.2.4",
 			Out: "kubectl/v1.2.4",
 		},
+		{
+			In:  `C:\Users\Kubernetes\kubectl.exe/v1.5.4`,
+			Out: "kubectl.exe/v1.5.4",
+		},
+		{
+			In:  `C:\Program Files\kubectl.exe/v1.5.4`,
+			Out: "kubectl.exe/v1.5.4",
+		},
 	} {
 		if cleanUserAgent(tc.In) != tc.Out {
 			t.Errorf("Failed to clean User-Agent: %s", tc.In)