From 6652c54d8390b8113b3df912637a64ae08743259 Mon Sep 17 00:00:00 2001 From: Shivam Sandbhor Date: Wed, 10 Nov 2021 10:19:40 +0530 Subject: [PATCH] Remove invalid comment in legacyregistry Signed-off-by: Shivam Sandbhor --- cmd/kube-proxy/app/server.go | 1 - hack/.staticcheck_failures | 1 - pkg/kubelet/server/server.go | 1 - .../k8s.io/component-base/metrics/legacyregistry/registry.go | 3 --- staging/src/k8s.io/controller-manager/app/serve.go | 1 - 5 files changed, 7 deletions(-) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 8241898fe66..891a1ef0fd0 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -623,7 +623,6 @@ func serveMetrics(bindAddress, proxyMode string, enableProfiling bool, errCh cha fmt.Fprintf(w, "%s", proxyMode) }) - //nolint:staticcheck // SA1019 See the Metrics Stability Migration KEP proxyMux.Handle("/metrics", legacyregistry.Handler()) if enableProfiling { diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 3edc11e1a1c..818ebdf37da 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -4,7 +4,6 @@ vendor/k8s.io/apimachinery/pkg/util/json vendor/k8s.io/apimachinery/pkg/util/strategicpatch vendor/k8s.io/apiserver/pkg/server/dynamiccertificates vendor/k8s.io/apiserver/pkg/server/filters -vendor/k8s.io/apiserver/pkg/server/routes vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope vendor/k8s.io/apiserver/pkg/util/wsstream vendor/k8s.io/client-go/rest diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 28dfc44977c..aff9fe0c3cd 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -353,7 +353,6 @@ func (s *Server) InstallDefaultHandlers() { s.addMetricsBucketMatcher("metrics/cadvisor") s.addMetricsBucketMatcher("metrics/probes") s.addMetricsBucketMatcher("metrics/resource") - //nolint:staticcheck // SA1019 https://github.com/kubernetes/enhancements/issues/1206 s.restfulCont.Handle(metricsPath, legacyregistry.Handler()) // cAdvisor metrics are exposed under the secured handler as well diff --git a/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go b/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go index 56a9dcae58b..c0092a36577 100644 --- a/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go +++ b/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go @@ -53,9 +53,6 @@ func init() { // Handler returns an HTTP handler for the DefaultGatherer. It is // already instrumented with InstrumentHandler (using "prometheus" as handler // name). -// -// Deprecated: Please note the issues described in the doc comment of -// InstrumentHandler. You might want to consider using promhttp.Handler instead. func Handler() http.Handler { return promhttp.InstrumentMetricHandler(prometheus.DefaultRegisterer, promhttp.HandlerFor(defaultRegistry, promhttp.HandlerOpts{})) } diff --git a/staging/src/k8s.io/controller-manager/app/serve.go b/staging/src/k8s.io/controller-manager/app/serve.go index ba1f465368c..c2043b82631 100644 --- a/staging/src/k8s.io/controller-manager/app/serve.go +++ b/staging/src/k8s.io/controller-manager/app/serve.go @@ -66,7 +66,6 @@ func NewBaseHandler(c *componentbaseconfig.DebuggingConfiguration, healthzHandle routes.DebugFlags{}.Install(mux, "v", routes.StringFlagPutHandler(logs.GlogSetter)) } configz.InstallHandler(mux) - //nolint:staticcheck // SA1019 See the Metrics Stability Migration KEP mux.Handle("/metrics", legacyregistry.Handler()) return mux