karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #945 from Garrybest/pr_metrics 

clean up metrics package init
This commit is contained in:
karmada-bot 2021-11-25 11:46:05 +08:00 committed by GitHub
parent 34ed1f7741 bc67417303
commit f0868a48b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/agent/main.go
View File

@ -3,6 +3,15 @@ package main
import (
"os"
// Note that Kubernetes registers workqueue metrics to default prometheus Registry. And the registry will be
// initialized by the package 'k8s.io/apiserver/pkg/server'.
// See https://github.com/kubernetes/kubernetes/blob/f61ed439882e34d9dad28b602afdc852feb2337a/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/metrics.go#L25
// But the controller-runtime registers workqueue metrics to its own Registry instead of default prometheus Registry.
// See https://github.com/kubernetes-sigs/controller-runtime/blob/4d10a0615b11507451ecb58bfd59f0f6ef313a29/pkg/metrics/workqueue.go#L24-L26
// However, global workqueue metrics factory will be only initialized once.
// See https://github.com/kubernetes/kubernetes/blob/f61ed439882e34d9dad28b602afdc852feb2337a/staging/src/k8s.io/client-go/util/workqueue/metrics.go#L257-L261
// So this package should be initialized before 'k8s.io/apiserver/pkg/server', thus the internal registry of
// controller-runtime could be set first.
_ "sigs.k8s.io/controller-runtime/pkg/metrics"
apiserver "k8s.io/apiserver/pkg/server"

11
cmd/controller-manager/controller-manager.go
View File

@ -4,6 +4,17 @@ import (
"fmt"
"os"
// Note that Kubernetes registers workqueue metrics to default prometheus Registry. And the registry will be
// initialized by the package 'k8s.io/apiserver/pkg/server'.
// See https://github.com/kubernetes/kubernetes/blob/f61ed439882e34d9dad28b602afdc852feb2337a/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/metrics.go#L25
// But the controller-runtime registers workqueue metrics to its own Registry instead of default prometheus Registry.
// See https://github.com/kubernetes-sigs/controller-runtime/blob/4d10a0615b11507451ecb58bfd59f0f6ef313a29/pkg/metrics/workqueue.go#L24-L26
// However, global workqueue metrics factory will be only initialized once.
// See https://github.com/kubernetes/kubernetes/blob/f61ed439882e34d9dad28b602afdc852feb2337a/staging/src/k8s.io/client-go/util/workqueue/metrics.go#L257-L261
// So this package should be initialized before 'k8s.io/apiserver/pkg/server', thus the internal registry of
// controller-runtime could be set first.
_ "sigs.k8s.io/controller-runtime/pkg/metrics"
apiserver "k8s.io/apiserver/pkg/server"
"k8s.io/component-base/logs"

2
cmd/scheduler-estimator/main.go
View File

@ -4,8 +4,6 @@ import (
"fmt"
"os"
_ "sigs.k8s.io/controller-runtime/pkg/metrics"
apiserver "k8s.io/apiserver/pkg/server"
"k8s.io/component-base/logs"