From 94c6f7d1e5b71742ff18cd8a31a33f27d41640f2 Mon Sep 17 00:00:00 2001
From: Todd Treece <360020+toddtreece@users.noreply.github.com>
Date: Wed, 19 Feb 2025 15:30:45 -0500
Subject: [PATCH] K8s: Remove duplicate aggregation metric (#101002)

---
 pkg/services/apiserver/aggregator/aggregator.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/services/apiserver/aggregator/aggregator.go b/pkg/services/apiserver/aggregator/aggregator.go
index 76a446c8990..0945ac83139 100644
--- a/pkg/services/apiserver/aggregator/aggregator.go
+++ b/pkg/services/apiserver/aggregator/aggregator.go
@@ -33,6 +33,7 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/component-base/metrics"
 	"k8s.io/component-base/metrics/legacyregistry"
 	"k8s.io/klog/v2"
 	v1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
@@ -266,11 +267,11 @@ func CreateAggregatorServer(config *Config, delegateAPIServer genericapiserver.D
 		}
 	}
 
-	metrics := newAvailabilityMetrics()
-
+	registry := legacyregistry.DefaultGatherer.(metrics.KubeRegistry)
+	availibilityMetrics := newAvailabilityMetrics()
 	// create shared (remote and local) availability metrics
 	// TODO: decouple from legacyregistry
-	registerIntoLegacyRegistryOnce.Do(func() { err = metrics.Register(legacyregistry.Register, legacyregistry.CustomRegister) })
+	registerIntoLegacyRegistryOnce.Do(func() { err = availibilityMetrics.Register(registry.Register, registry.CustomRegister) })
 	if err != nil {
 		return nil, err
 	}
@@ -282,7 +283,7 @@ func CreateAggregatorServer(config *Config, delegateAPIServer genericapiserver.D
 		nil,
 		proxyCurrentCertKeyContentFunc,
 		completedConfig.ExtraConfig.ServiceResolver,
-		metrics,
+		availibilityMetrics,
 	)
 	if err != nil {
 		return nil, err