pkg/apiserver: refactor InstrumentRouteFunc

boazca · Apr 18, 2019 · 34298a0 · 34298a0
1 parent 15832a3
commit 34298a0
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 6 deletions.
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -319,7 +319,7 @@ import (
 
     "github.com/golang/glog"
     "k8s.io/apimachinery/pkg/util/wait"
-    "k8s.io/apiserver/pkg/util/logs"
+    "k8s.io/component-base/logs"
 
     basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd"
     "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"

diff --git a/pkg/apiserver/installer/cmhandlers.go b/pkg/apiserver/installer/cmhandlers.go
@@ -127,7 +127,16 @@ func (ch *CMHandlers) registerResourceHandlers(a *MetricsAPIInstaller, ws *restf
 		},
 	}
 
-	rootScopedHandler := metrics.InstrumentRouteFunc("LIST", "custom-metrics", "", "cluster", restfulListResource(lister, nil, reqScope, false, a.minRequestTimeout))
+	rootScopedHandler := metrics.InstrumentRouteFunc(
+		"LIST",
+		a.group.GroupVersion.Group,
+		a.group.GroupVersion.Version,
+		reqScope.Resource.Resource,
+		reqScope.Subresource,
+		"cluster",
+		"custom-metrics",
+		restfulListResource(lister, nil, reqScope, false, a.minRequestTimeout),
+	)
 
 	// install the root-scoped route
 	rootScopedRoute := ws.GET(rootScopedPath).To(rootScopedHandler).
@@ -151,7 +160,17 @@ func (ch *CMHandlers) registerResourceHandlers(a *MetricsAPIInstaller, ws *restf
 			SelfLinkPathPrefix: gpath.Join(a.prefix, "namespaces") + "/",
 		},
 	}
-	namespacedHandler := metrics.InstrumentRouteFunc("LIST", "custom-metrics-namespaced", "", "namespace", restfulListResource(lister, nil, reqScope, false, a.minRequestTimeout))
+	namespacedHandler := metrics.InstrumentRouteFunc(
+		"LIST",
+		a.group.GroupVersion.Group,
+		a.group.GroupVersion.Version,
+		reqScope.Resource.Resource,
+		reqScope.Subresource,
+		"resource",
+		"custom-metrics",
+		restfulListResource(lister, nil, reqScope, false, a.minRequestTimeout),
+	)
+
 	namespacedRoute := ws.GET(namespacedPath).To(namespacedHandler).
 		Doc(doc).
 		Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")).
@@ -173,7 +192,18 @@ func (ch *CMHandlers) registerResourceHandlers(a *MetricsAPIInstaller, ws *restf
 			SelfLinkPathPrefix: gpath.Join(a.prefix, "namespaces") + "/",
 		},
 	}
-	namespaceSpecificHandler := metrics.InstrumentRouteFunc("LIST", "custom-metrics-for-namespace", "", "cluster", restfulListResource(lister, nil, reqScope, false, a.minRequestTimeout))
+
+	namespaceSpecificHandler := metrics.InstrumentRouteFunc(
+		"LIST",
+		a.group.GroupVersion.Group,
+		a.group.GroupVersion.Version,
+		reqScope.Resource.Resource,
+		reqScope.Subresource,
+		"resource",
+		"custom-metrics",
+		restfulListResource(lister, nil, reqScope, false, a.minRequestTimeout),
+	)
+
 	namespaceSpecificRoute := ws.GET(namespaceSpecificPath).To(namespaceSpecificHandler).
 		Doc(doc).
 		Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")).

diff --git a/pkg/apiserver/installer/emhandlers.go b/pkg/apiserver/installer/emhandlers.go
@@ -106,7 +106,16 @@ func (ch *EMHandlers) registerResourceHandlers(a *MetricsAPIInstaller, ws *restf
 		},
 	}
 
-	externalMetricHandler := metrics.InstrumentRouteFunc("LIST", "external-metrics", "", "", restfulListResource(lister, nil, reqScope, false, a.minRequestTimeout))
+	externalMetricHandler := metrics.InstrumentRouteFunc(
+		"LIST",
+		a.group.GroupVersion.Group,
+		a.group.GroupVersion.Version,
+		reqScope.Resource.Resource,
+		reqScope.Subresource,
+		"cluster",
+		"external-metrics",
+		restfulListResource(lister, nil, reqScope, false, a.minRequestTimeout),
+	)
 
 	externalMetricRoute := ws.GET(externalMetricPath).To(externalMetricHandler).
 		Doc(doc).

diff --git a/test-adapter/main.go b/test-adapter/main.go
@@ -24,7 +24,7 @@ import (
 	"github.com/emicklei/go-restful"
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/apiserver/pkg/util/logs"
+	"k8s.io/component-base/logs"
 
 	basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd"
 	"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"