github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Moved Register() to init()

Browse Source
This commit is contained in:
xing-yang 2022-11-02 19:54:38 +00:00
parent 8ce37fde95
commit b4e6bed525
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/podgc/gc_controller.go
View File

@ -68,6 +68,11 @@ type PodGCController struct {
quarantineTime time.Duration quarantineTime time.Duration
} }
func init() {
// Register prometheus metrics
Register()
}
func NewPodGC(ctx context.Context, kubeClient clientset.Interface, podInformer coreinformers.PodInformer, func NewPodGC(ctx context.Context, kubeClient clientset.Interface, podInformer coreinformers.PodInformer,
nodeInformer coreinformers.NodeInformer, terminatedPodThreshold int) *PodGCController { nodeInformer coreinformers.NodeInformer, terminatedPodThreshold int) *PodGCController {
return NewPodGCInternal(ctx, kubeClient, podInformer, nodeInformer, terminatedPodThreshold, gcCheckPeriod, quarantineTime) return NewPodGCInternal(ctx, kubeClient, podInformer, nodeInformer, terminatedPodThreshold, gcCheckPeriod, quarantineTime)
@ -76,9 +81,6 @@ func NewPodGC(ctx context.Context, kubeClient clientset.Interface, podInformer c
// This function is only intended for integration tests // This function is only intended for integration tests
func NewPodGCInternal(ctx context.Context, kubeClient clientset.Interface, podInformer coreinformers.PodInformer, func NewPodGCInternal(ctx context.Context, kubeClient clientset.Interface, podInformer coreinformers.PodInformer,
nodeInformer coreinformers.NodeInformer, terminatedPodThreshold int, gcCheckPeriod, quarantineTime time.Duration) *PodGCController { nodeInformer coreinformers.NodeInformer, terminatedPodThreshold int, gcCheckPeriod, quarantineTime time.Duration) *PodGCController {
// Register prometheus metrics
Register()
gcc := &PodGCController{ gcc := &PodGCController{
kubeClient: kubeClient, kubeClient: kubeClient,
terminatedPodThreshold: terminatedPodThreshold, terminatedPodThreshold: terminatedPodThreshold,

4
pkg/controller/podgc/metrics.go
View File

@ -25,8 +25,8 @@ import (
const ( const (
podGCController = "pod_gc_collector" podGCController = "pod_gc_collector"
deletingPods = "deleting_pods_total" deletingPods = "force_delete_pods_total"
deletingPodsError = "deleting_pods_error_total" deletingPodsError = "force_delete_pod_errors_total"
) )
var ( var (