github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91344 from happinesstaker/sametric-fix

Browse Source 
Minor Fix: Restrict service account token metrics to kube-apiserver only.
This commit is contained in:
Kubernetes Prow Robot
2020-05-22 02:34:37 -07:00
committed by GitHub
parent cdbd07f64e ebbd455b24
commit ca324214be
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,6 +300,7 @@ func CreateKubeAPIServerConfig(
}) })
s.Metrics.Apply() s.Metrics.Apply()
serviceaccount.RegisterMetrics()
serviceIPRange, apiServerServiceIP, err := master.ServiceIPRange(s.PrimaryServiceClusterIPRange) serviceIPRange, apiServerServiceIP, err := master.ServiceIPRange(s.PrimaryServiceClusterIPRange)
if err != nil { if err != nil {

14
pkg/serviceaccount/metrics.go
View File

@@ -17,6 +17,8 @@ limitations under the License.
package serviceaccount package serviceaccount
import ( import (
"sync"
"k8s.io/component-base/metrics" "k8s.io/component-base/metrics"
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
) )
@@ -56,8 +58,12 @@ var (
) )
) )
func init() { var registerMetricsOnce sync.Once
legacyregistry.MustRegister(legacyTokensTotal)
legacyregistry.MustRegister(staleTokensTotal) func RegisterMetrics() {
legacyregistry.MustRegister(validTokensTotal) registerMetricsOnce.Do(func() {
legacyregistry.MustRegister(legacyTokensTotal)
legacyregistry.MustRegister(staleTokensTotal)
legacyregistry.MustRegister(validTokensTotal)
})
} }