mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #106291 from sbs2001/fix_invalid_comment
Remove invalid comment in legacyregistry
This commit is contained in:
commit
15e5f2a19a
@ -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 {
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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{}))
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user