From 849312b883b57880210ffadf6c246ed63c9e62ab Mon Sep 17 00:00:00 2001
From: Lalatendu Mohanty <lmohanty@redhat.com>
Date: Mon, 24 Jun 2024 19:19:29 -0400
Subject: [PATCH] Fixing the labels for better  metrics collection

As the label selector used for both catalogd and operator-controller
metrics services is "control-plane: controller-manager". Hence changing
the labels in both operator-controller and catalogd to make sure we
do not overlap.

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
---
 config/base/manager/manager.yaml         | 8 ++++----
 config/base/prometheus/monitor.yaml      | 4 ++--
 config/base/rbac/auth_proxy_service.yaml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/base/manager/manager.yaml b/config/base/manager/manager.yaml
index 5c3b89f91..2f84cd1b9 100644
--- a/config/base/manager/manager.yaml
+++ b/config/base/manager/manager.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: operator-controller-controller-manager
     pod-security.kubernetes.io/enforce: restricted
     pod-security.kubernetes.io/enforce-version: latest
   name: system
@@ -15,18 +15,18 @@ metadata:
   annotations:
     kubectl.kubernetes.io/default-logs-container: manager
   labels:
-    control-plane: controller-manager
+    control-plane: operator-controller-controller-manager
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: operator-controller-controller-manager
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: operator-controller-controller-manager
     spec:
       affinity:
         nodeAffinity:
diff --git a/config/base/prometheus/monitor.yaml b/config/base/prometheus/monitor.yaml
index d19136ae7..7e5c2db13 100644
--- a/config/base/prometheus/monitor.yaml
+++ b/config/base/prometheus/monitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: operator-controller-controller-manager
   name: controller-manager-metrics-monitor
   namespace: system
 spec:
@@ -17,4 +17,4 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: operator-controller-controller-manager
diff --git a/config/base/rbac/auth_proxy_service.yaml b/config/base/rbac/auth_proxy_service.yaml
index 71f179727..ae58ae83b 100644
--- a/config/base/rbac/auth_proxy_service.yaml
+++ b/config/base/rbac/auth_proxy_service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: operator-controller-controller-manager
   name: controller-manager-metrics-service
   namespace: system
 spec:
@@ -12,4 +12,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    control-plane: operator-controller-controller-manager