Merge pull request kubernetes#91344 from happinesstaker/sametric-fix

k8s-ci-robot · web-flow · commit ca324214be0c · 2020-05-22T02:34:37.000-07:00
Minor Fix: Restrict service account token metrics to kube-apiserver only.
diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
@@ -300,6 +300,7 @@ func CreateKubeAPIServerConfig(
 	})
 
 	s.Metrics.Apply()
+	serviceaccount.RegisterMetrics()
 
 	serviceIPRange, apiServerServiceIP, err := master.ServiceIPRange(s.PrimaryServiceClusterIPRange)
 	if err != nil {
diff --git a/pkg/serviceaccount/metrics.go b/pkg/serviceaccount/metrics.go
@@ -17,6 +17,8 @@ limitations under the License.
 package serviceaccount
 
 import (
+	"sync"
+
 	"k8s.io/component-base/metrics"
 	"k8s.io/component-base/metrics/legacyregistry"
 )
@@ -56,8 +58,12 @@ var (
 	)
 )
 
-func init() {
-	legacyregistry.MustRegister(legacyTokensTotal)
-	legacyregistry.MustRegister(staleTokensTotal)
-	legacyregistry.MustRegister(validTokensTotal)
+var registerMetricsOnce sync.Once
+
+func RegisterMetrics() {
+	registerMetricsOnce.Do(func() {
+		legacyregistry.MustRegister(legacyTokensTotal)
+		legacyregistry.MustRegister(staleTokensTotal)
+		legacyregistry.MustRegister(validTokensTotal)
+	})
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ limitations under the License.`
`17`	`17`	`package serviceaccount`
`18`	`18`
`19`	`19`	`import (`
	`20`	`+ "sync"`
	`21`	`+`
`20`	`22`	`"k8s.io/component-base/metrics"`
`21`	`23`	`"k8s.io/component-base/metrics/legacyregistry"`
`22`	`24`	`)`
`@@ -56,8 +58,12 @@ var (`
`56`	`58`	`)`
`57`	`59`	`)`
`58`	`60`
`59`		`-func init() {`
`60`		`- legacyregistry.MustRegister(legacyTokensTotal)`
`61`		`- legacyregistry.MustRegister(staleTokensTotal)`
`62`		`- legacyregistry.MustRegister(validTokensTotal)`
	`61`	`+var registerMetricsOnce sync.Once`
	`62`	`+`
	`63`	`+func RegisterMetrics() {`
	`64`	`+ registerMetricsOnce.Do(func() {`
	`65`	`+ legacyregistry.MustRegister(legacyTokensTotal)`
	`66`	`+ legacyregistry.MustRegister(staleTokensTotal)`
	`67`	`+ legacyregistry.MustRegister(validTokensTotal)`
	`68`	`+ })`
`63`	`69`	`}`