github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 21:25:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49636 from FengyunPan/register-metric-same

Browse Source 
Automatic merge from submit-queue

Fix same registered ownerName in prometheus

TokensController and ServiceAccountsController use same name to
register metric ownerName in prometheus.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
#49635

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-07-26 08:06:54 -07:00
committed by GitHub
parent 744455c69d e4cb9a0824
commit 5eaeab4cc3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/serviceaccount/tokens_controller.go
View File

@@ -87,7 +87,7 @@ func NewTokensController(serviceAccounts informers.ServiceAccountInformer, secre
maxRetries: maxRetries,
}
if cl != nil && cl.Core().RESTClient().GetRateLimiter() != nil {
metrics.RegisterMetricAndTrackRateLimiterUsage("serviceaccount_controller", cl.Core().RESTClient().GetRateLimiter())
metrics.RegisterMetricAndTrackRateLimiterUsage("serviceaccount_tokens_controller", cl.Core().RESTClient().GetRateLimiter())
}
e.serviceAccounts = serviceAccounts.Lister()