github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106291 from sbs2001/fix_invalid_comment

Browse Source 
Remove invalid comment in legacyregistry
This commit is contained in:
Kubernetes Prow Robot 2021-12-09 19:03:10 -08:00 committed by GitHub
commit 15e5f2a19a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kube-proxy/app/server.go
View File

@ -623,7 +623,6 @@ func serveMetrics(bindAddress, proxyMode string, enableProfiling bool, errCh cha
fmt.Fprintf(w, "%s", proxyMode) fmt.Fprintf(w, "%s", proxyMode)
}) })
//nolint:staticcheck // SA1019 See the Metrics Stability Migration KEP
proxyMux.Handle("/metrics", legacyregistry.Handler()) proxyMux.Handle("/metrics", legacyregistry.Handler())
if enableProfiling { if enableProfiling {

1
hack/.staticcheck_failures
View File

@ -4,7 +4,6 @@ vendor/k8s.io/apimachinery/pkg/util/json
vendor/k8s.io/apimachinery/pkg/util/strategicpatch vendor/k8s.io/apimachinery/pkg/util/strategicpatch
vendor/k8s.io/apiserver/pkg/server/dynamiccertificates vendor/k8s.io/apiserver/pkg/server/dynamiccertificates
vendor/k8s.io/apiserver/pkg/server/filters 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/storage/value/encrypt/envelope
vendor/k8s.io/apiserver/pkg/util/wsstream vendor/k8s.io/apiserver/pkg/util/wsstream
vendor/k8s.io/client-go/rest vendor/k8s.io/client-go/rest

1
pkg/kubelet/server/server.go
View File

@ -353,7 +353,6 @@ func (s *Server) InstallDefaultHandlers() {
s.addMetricsBucketMatcher("metrics/cadvisor") s.addMetricsBucketMatcher("metrics/cadvisor")
s.addMetricsBucketMatcher("metrics/probes") s.addMetricsBucketMatcher("metrics/probes")
s.addMetricsBucketMatcher("metrics/resource") s.addMetricsBucketMatcher("metrics/resource")
//nolint:staticcheck // SA1019 https://github.com/kubernetes/enhancements/issues/1206
s.restfulCont.Handle(metricsPath, legacyregistry.Handler()) s.restfulCont.Handle(metricsPath, legacyregistry.Handler())
// cAdvisor metrics are exposed under the secured handler as well // cAdvisor metrics are exposed under the secured handler as well

3
staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go
View File

@ -53,9 +53,6 @@ func init() {
// Handler returns an HTTP handler for the DefaultGatherer. It is // Handler returns an HTTP handler for the DefaultGatherer. It is
// already instrumented with InstrumentHandler (using "prometheus" as handler // already instrumented with InstrumentHandler (using "prometheus" as handler
// name). // 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 { func Handler() http.Handler {
return promhttp.InstrumentMetricHandler(prometheus.DefaultRegisterer, promhttp.HandlerFor(defaultRegistry, promhttp.HandlerOpts{})) return promhttp.InstrumentMetricHandler(prometheus.DefaultRegisterer, promhttp.HandlerFor(defaultRegistry, promhttp.HandlerOpts{}))
} }

1
staging/src/k8s.io/controller-manager/app/serve.go
View File

@ -66,7 +66,6 @@ func NewBaseHandler(c *componentbaseconfig.DebuggingConfiguration, healthzHandle
routes.DebugFlags{}.Install(mux, "v", routes.StringFlagPutHandler(logs.GlogSetter)) routes.DebugFlags{}.Install(mux, "v", routes.StringFlagPutHandler(logs.GlogSetter))
} }
configz.InstallHandler(mux) configz.InstallHandler(mux)
//nolint:staticcheck // SA1019 See the Metrics Stability Migration KEP
mux.Handle("/metrics", legacyregistry.Handler()) mux.Handle("/metrics", legacyregistry.Handler())
return mux return mux