diff --git a/pkg/controller/podgc/gc_controller.go b/pkg/controller/podgc/gc_controller.go index 36140ba891d..0b376313a4e 100644 --- a/pkg/controller/podgc/gc_controller.go +++ b/pkg/controller/podgc/gc_controller.go @@ -68,6 +68,11 @@ type PodGCController struct { quarantineTime time.Duration } +func init() { + // Register prometheus metrics + Register() +} + func NewPodGC(ctx context.Context, kubeClient clientset.Interface, podInformer coreinformers.PodInformer, nodeInformer coreinformers.NodeInformer, terminatedPodThreshold int) *PodGCController { 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 func NewPodGCInternal(ctx context.Context, kubeClient clientset.Interface, podInformer coreinformers.PodInformer, nodeInformer coreinformers.NodeInformer, terminatedPodThreshold int, gcCheckPeriod, quarantineTime time.Duration) *PodGCController { - // Register prometheus metrics - Register() - gcc := &PodGCController{ kubeClient: kubeClient, terminatedPodThreshold: terminatedPodThreshold, diff --git a/pkg/controller/podgc/metrics.go b/pkg/controller/podgc/metrics.go index 7761aa6ad38..5eaf033bfaa 100644 --- a/pkg/controller/podgc/metrics.go +++ b/pkg/controller/podgc/metrics.go @@ -25,8 +25,8 @@ import ( const ( podGCController = "pod_gc_collector" - deletingPods = "deleting_pods_total" - deletingPodsError = "deleting_pods_error_total" + deletingPods = "force_delete_pods_total" + deletingPodsError = "force_delete_pod_errors_total" ) var (