From dfd81634b085f391930347f54fa4d3f741347d26 Mon Sep 17 00:00:00 2001
From: Ethan <32370007+SadFaceSmith@users.noreply.github.com>
Date: Sat, 25 Oct 2025 17:33:38 -0400
Subject: [PATCH] update endpoint and proxygroup

---
 cmd/k8s-operator/proxygroup.go | 9 +++++----
 cmd/k8s-operator/sts.go        | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmd/k8s-operator/proxygroup.go b/cmd/k8s-operator/proxygroup.go
index debeb5c6b..9313280cd 100644
--- a/cmd/k8s-operator/proxygroup.go
+++ b/cmd/k8s-operator/proxygroup.go
@@ -405,10 +405,11 @@ func (r *ProxyGroupReconciler) maybeProvision(ctx context.Context, pg *tsapi.Pro
 	}
 
 	mo := &metricsOpts{
-		tsNamespace:  r.tsNamespace,
-		proxyStsName: pg.Name,
-		proxyLabels:  pgLabels(pg.Name, nil),
-		proxyType:    "proxygroup",
+		tsNamespace:     r.tsNamespace,
+		proxyStsName:    pg.Name,
+		proxyLabels:     pgLabels(pg.Name, nil),
+		proxyType:       "proxygroup",
+		metricsPortName: metricsPortName(proxyClass),
 	}
 	if err := reconcileMetricsResources(ctx, logger, mo, proxyClass, r.Client); err != nil {
 		return r.notReadyErrf(pg, logger, "error reconciling metrics resources: %w", err)
diff --git a/cmd/k8s-operator/sts.go b/cmd/k8s-operator/sts.go
index 21c67ff10..3e8ae47de 100644
--- a/cmd/k8s-operator/sts.go
+++ b/cmd/k8s-operator/sts.go
@@ -854,7 +854,7 @@ func applyProxyClassToStatefulSet(pc *tsapi.ProxyClass, ss *appsv1.StatefulSet,
 			// For egress proxies, currently all cluster traffic is forwarded to the tailnet target.
 			logger.Info("ProxyClass specifies that metrics should be enabled, but this is currently not supported for Ingress proxies that accept cluster traffic.")
 		} else {
-			enableEndpoints(ss, metricsEnabled, debugEnabled)
+			enableEndpoints(ss, metricsEnabled, debugEnabled, metricsPortName(pc))
 		}
 	}
 
@@ -957,7 +957,7 @@ func applyProxyClassToStatefulSet(pc *tsapi.ProxyClass, ss *appsv1.StatefulSet,
 	return ss
 }
 
-func enableEndpoints(ss *appsv1.StatefulSet, metrics, debug bool) {
+func enableEndpoints(ss *appsv1.StatefulSet, metrics, debug bool, metricsPortName string) {
 	for i, c := range ss.Spec.Template.Spec.Containers {
 		if isMainContainer(&c) {
 			if debug {
@@ -1002,7 +1002,7 @@ func enableEndpoints(ss *appsv1.StatefulSet, metrics, debug bool) {
 				)
 				ss.Spec.Template.Spec.Containers[i].Ports = append(ss.Spec.Template.Spec.Containers[i].Ports,
 					corev1.ContainerPort{
-						Name:          "metrics",
+						Name:          metricsPortName,
 						Protocol:      "TCP",
 						ContainerPort: 9002,
 					},