From ca07f8ffba6c6ab50490771fb9013cd121597488 Mon Sep 17 00:00:00 2001
From: clcc2019 <46099295+clcc2019@users.noreply.github.com>
Date: Mon, 20 Jul 2026 14:48:26 +0800
Subject: [PATCH] docs: use operator-managed Typha metrics service

Signed-off-by: Song Duan <dsong.cc@gmail.com>
Signed-off-by: clcc2019 <46099295+clcc2019@users.noreply.github.com>
---
 .../monitor/monitor-component-metrics.mdx     | 23 ++++++-------------
 .../monitor/monitor-component-metrics.mdx     | 23 ++++++-------------
 .../monitor/monitor-component-metrics.mdx     | 23 ++++++-------------
 .../monitor/monitor-component-metrics.mdx     | 23 ++++++-------------
 .../monitor/monitor-component-metrics.mdx     | 23 ++++++-------------
 5 files changed, 35 insertions(+), 80 deletions(-)

diff --git a/calico/operations/monitor/monitor-component-metrics.mdx b/calico/operations/monitor/monitor-component-metrics.mdx
index 3b9f410ce7..030de54a02 100644
--- a/calico/operations/monitor/monitor-component-metrics.mdx
+++ b/calico/operations/monitor/monitor-component-metrics.mdx
@@ -248,21 +248,13 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr
 <Tabs>
 <TabItem label="Operator" value="Operator-8">
 
+When you set `spec.typhaMetricsPort`, the operator automatically creates the `calico-typha-metrics` service in the
+`calico-system` namespace. You do not need to create another service.
+
+Verify the operator-managed service:
+
 ```bash
-kubectl apply -f - <<EOF
-apiVersion: v1
-kind: Service
-metadata:
-  name: typha-metrics-svc
-  namespace: calico-system
-spec:
-  clusterIP: None
-  selector:
-    k8s-app: calico-typha
-  ports:
-  - port: 9093
-    targetPort: 9093
-EOF
+kubectl get service calico-typha-metrics -n calico-system
 ```
 
 </TabItem>
@@ -491,7 +483,7 @@ data:
       - role: endpoints
       relabel_configs:
       - source_labels: [__meta_kubernetes_service_name]
-        regex: typha-metrics-svc
+        regex: calico-typha-metrics
         replacement: $1
         action: keep
       - source_labels: [__meta_kubernetes_pod_container_port_name]
@@ -656,7 +648,6 @@ First remove the services by executing the following command:
 
 ```bash
 kubectl delete service felix-metrics-svc -n calico-system
-kubectl delete service typha-metrics-svc -n calico-system
 ```
 
 If running $[prodnameWindows], also clean up the Windows nodes service:
diff --git a/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-metrics.mdx b/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-metrics.mdx
index 1d124d7369..382baef42e 100644
--- a/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-metrics.mdx
+++ b/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-metrics.mdx
@@ -248,21 +248,13 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr
 <Tabs>
 <TabItem label="Operator" value="Operator-8">
 
+When you set `spec.typhaMetricsPort`, the operator automatically creates the `calico-typha-metrics` service in the
+`calico-system` namespace. You do not need to create another service.
+
+Verify the operator-managed service:
+
 ```bash
-kubectl apply -f - <<EOF
-apiVersion: v1
-kind: Service
-metadata:
-  name: typha-metrics-svc
-  namespace: calico-system
-spec:
-  clusterIP: None
-  selector:
-    k8s-app: calico-typha
-  ports:
-  - port: 9093
-    targetPort: 9093
-EOF
+kubectl get service calico-typha-metrics -n calico-system
 ```
 
 </TabItem>
@@ -491,7 +483,7 @@ data:
       - role: endpoints
       relabel_configs:
       - source_labels: [__meta_kubernetes_service_name]
-        regex: typha-metrics-svc
+        regex: calico-typha-metrics
         replacement: $1
         action: keep
       - source_labels: [__meta_kubernetes_pod_container_port_name]
@@ -656,7 +648,6 @@ First remove the services by executing the following command:
 
 ```bash
 kubectl delete service felix-metrics-svc -n calico-system
-kubectl delete service typha-metrics-svc -n calico-system
 ```
 
 If running $[prodnameWindows], also clean up the Windows nodes service:
diff --git a/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-metrics.mdx b/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-metrics.mdx
index 1d124d7369..382baef42e 100644
--- a/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-metrics.mdx
+++ b/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-metrics.mdx
@@ -248,21 +248,13 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr
 <Tabs>
 <TabItem label="Operator" value="Operator-8">
 
+When you set `spec.typhaMetricsPort`, the operator automatically creates the `calico-typha-metrics` service in the
+`calico-system` namespace. You do not need to create another service.
+
+Verify the operator-managed service:
+
 ```bash
-kubectl apply -f - <<EOF
-apiVersion: v1
-kind: Service
-metadata:
-  name: typha-metrics-svc
-  namespace: calico-system
-spec:
-  clusterIP: None
-  selector:
-    k8s-app: calico-typha
-  ports:
-  - port: 9093
-    targetPort: 9093
-EOF
+kubectl get service calico-typha-metrics -n calico-system
 ```
 
 </TabItem>
@@ -491,7 +483,7 @@ data:
       - role: endpoints
       relabel_configs:
       - source_labels: [__meta_kubernetes_service_name]
-        regex: typha-metrics-svc
+        regex: calico-typha-metrics
         replacement: $1
         action: keep
       - source_labels: [__meta_kubernetes_pod_container_port_name]
@@ -656,7 +648,6 @@ First remove the services by executing the following command:
 
 ```bash
 kubectl delete service felix-metrics-svc -n calico-system
-kubectl delete service typha-metrics-svc -n calico-system
 ```
 
 If running $[prodnameWindows], also clean up the Windows nodes service:
diff --git a/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-metrics.mdx b/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-metrics.mdx
index 1d124d7369..382baef42e 100644
--- a/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-metrics.mdx
+++ b/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-metrics.mdx
@@ -248,21 +248,13 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr
 <Tabs>
 <TabItem label="Operator" value="Operator-8">
 
+When you set `spec.typhaMetricsPort`, the operator automatically creates the `calico-typha-metrics` service in the
+`calico-system` namespace. You do not need to create another service.
+
+Verify the operator-managed service:
+
 ```bash
-kubectl apply -f - <<EOF
-apiVersion: v1
-kind: Service
-metadata:
-  name: typha-metrics-svc
-  namespace: calico-system
-spec:
-  clusterIP: None
-  selector:
-    k8s-app: calico-typha
-  ports:
-  - port: 9093
-    targetPort: 9093
-EOF
+kubectl get service calico-typha-metrics -n calico-system
 ```
 
 </TabItem>
@@ -491,7 +483,7 @@ data:
       - role: endpoints
       relabel_configs:
       - source_labels: [__meta_kubernetes_service_name]
-        regex: typha-metrics-svc
+        regex: calico-typha-metrics
         replacement: $1
         action: keep
       - source_labels: [__meta_kubernetes_pod_container_port_name]
@@ -656,7 +648,6 @@ First remove the services by executing the following command:
 
 ```bash
 kubectl delete service felix-metrics-svc -n calico-system
-kubectl delete service typha-metrics-svc -n calico-system
 ```
 
 If running $[prodnameWindows], also clean up the Windows nodes service:
diff --git a/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-metrics.mdx b/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-metrics.mdx
index 3b9f410ce7..030de54a02 100644
--- a/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-metrics.mdx
+++ b/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-metrics.mdx
@@ -248,21 +248,13 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr
 <Tabs>
 <TabItem label="Operator" value="Operator-8">
 
+When you set `spec.typhaMetricsPort`, the operator automatically creates the `calico-typha-metrics` service in the
+`calico-system` namespace. You do not need to create another service.
+
+Verify the operator-managed service:
+
 ```bash
-kubectl apply -f - <<EOF
-apiVersion: v1
-kind: Service
-metadata:
-  name: typha-metrics-svc
-  namespace: calico-system
-spec:
-  clusterIP: None
-  selector:
-    k8s-app: calico-typha
-  ports:
-  - port: 9093
-    targetPort: 9093
-EOF
+kubectl get service calico-typha-metrics -n calico-system
 ```
 
 </TabItem>
@@ -491,7 +483,7 @@ data:
       - role: endpoints
       relabel_configs:
       - source_labels: [__meta_kubernetes_service_name]
-        regex: typha-metrics-svc
+        regex: calico-typha-metrics
         replacement: $1
         action: keep
       - source_labels: [__meta_kubernetes_pod_container_port_name]
@@ -656,7 +648,6 @@ First remove the services by executing the following command:
 
 ```bash
 kubectl delete service felix-metrics-svc -n calico-system
-kubectl delete service typha-metrics-svc -n calico-system
 ```
 
 If running $[prodnameWindows], also clean up the Windows nodes service: