Skip to content
This repository was archived by the owner on Mar 16, 2024. It is now read-only.

Commit

Permalink
Merge pull request #106291 from sbs2001/fix_invalid_comment
Browse files Browse the repository at this point in the history
Remove invalid comment in legacyregistry

Kubernetes-commit: 15e5f2a19ae25228e9e5694d15d92a5a4e33d6ce
  • Loading branch information
k8s-publishing-bot committed Dec 10, 2021
2 parents 6173534 + 2b92dc8 commit 658ceb3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ require (
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
gotest.tools/v3 v3.0.3 // indirect
k8s.io/apimachinery v0.0.0-20211209170455-0cb2c3db59f8
k8s.io/client-go v0.0.0-20211209170923-cbd965eeb4c8
k8s.io/client-go v0.0.0-20211209211038-096f1fdd87d3
k8s.io/klog/v2 v2.30.0
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20211209170646-f3ee22923504
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211209170455-0cb2c3db59f8
k8s.io/client-go => k8s.io/client-go v0.0.0-20211209170923-cbd965eeb4c8
k8s.io/client-go => k8s.io/client-go v0.0.0-20211209211038-096f1fdd87d3
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -832,8 +832,8 @@ k8s.io/api v0.0.0-20211209170646-f3ee22923504 h1:6JLaPOkS6LYTHaPd+7I3maNLIPr+LNx
k8s.io/api v0.0.0-20211209170646-f3ee22923504/go.mod h1:vT/yvHJSEI2jdvhiOHO4SoXZ/Hmo14g9cqa8sBvRTdg=
k8s.io/apimachinery v0.0.0-20211209170455-0cb2c3db59f8 h1:SHH6kFVtEvxNSZez5MyZwrsCT9202hBuKAmC7KNcWO4=
k8s.io/apimachinery v0.0.0-20211209170455-0cb2c3db59f8/go.mod h1:pBvrJ8lBABNOJi8S/j3bmYSmYDsfR3UBj+1Ky64b1JY=
k8s.io/client-go v0.0.0-20211209170923-cbd965eeb4c8 h1:mfv+5RzbdiQ70CtVyUe0raug0Q1N4bq/3AuOzQOL0w8=
k8s.io/client-go v0.0.0-20211209170923-cbd965eeb4c8/go.mod h1:meNchCrJn71TivWeRLM312q8vOfk0uZkJQh8QfQqT1Q=
k8s.io/client-go v0.0.0-20211209211038-096f1fdd87d3 h1:sCpfOTovybxdB5UEFwPyHotRxa3eXvob2novG+nltHc=
k8s.io/client-go v0.0.0-20211209211038-096f1fdd87d3/go.mod h1:meNchCrJn71TivWeRLM312q8vOfk0uZkJQh8QfQqT1Q=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
Expand Down
3 changes: 0 additions & 3 deletions metrics/legacyregistry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}))
}
Expand Down

0 comments on commit 658ceb3

Please sign in to comment.