From ac57d339bcbbdd305a9a5c7af249f519d8a8a05d Mon Sep 17 00:00:00 2001
From: Chandan Kumar <raukadah@gmail.com>
Date: Mon, 25 Nov 2024 12:00:18 +0530
Subject: [PATCH] Fix controller manager label

In all the openstack-operators, openstack.org/operator-name label is
used. The same needs to be used in watcher-operator. Otherwise During
log collection, ci-framework env_op_images role fails while querying
all controller manager pods.

This pr adds openstack.org/operator-name: watcher label to the operator.

Signed-off-by: Chandan Kumar <raukadah@gmail.com>
---
 config/manager/manager.yaml         | 6 +++---
 config/prometheus/monitor.yaml      | 3 +--
 config/rbac/auth_proxy_service.yaml | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index f1d0397..9a3ee15 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -3,7 +3,6 @@ kind: Namespace
 metadata:
   labels:
     control-plane: controller-manager
-    app.kubernetes.io/name: watcher-operator
     app.kubernetes.io/managed-by: kustomize
   name: system
 ---
@@ -14,12 +13,12 @@ metadata:
   namespace: system
   labels:
     control-plane: controller-manager
-    app.kubernetes.io/name: watcher-operator
+    openstack.org/operator-name: watcher
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      openstack.org/operator-name: watcher
   replicas: 1
   template:
     metadata:
@@ -27,6 +26,7 @@ spec:
         kubectl.kubernetes.io/default-container: manager
       labels:
         control-plane: controller-manager
+        openstack.org/operator-name: watcher
     spec:
       # TODO(user): Uncomment the following code to configure the nodeAffinity expression
       # according to the platforms which are supported by your solution.
diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
index 351784c..916797e 100644
--- a/config/prometheus/monitor.yaml
+++ b/config/prometheus/monitor.yaml
@@ -4,7 +4,6 @@ kind: ServiceMonitor
 metadata:
   labels:
     control-plane: controller-manager
-    app.kubernetes.io/name: watcher-operator
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-monitor
   namespace: system
@@ -18,4 +17,4 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      openstack.org/operator-name: watcher
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
index 703747a..94c22a6 100644
--- a/config/rbac/auth_proxy_service.yaml
+++ b/config/rbac/auth_proxy_service.yaml
@@ -3,7 +3,6 @@ kind: Service
 metadata:
   labels:
     control-plane: controller-manager
-    app.kubernetes.io/name: watcher-operator
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-service
   namespace: system
@@ -14,4 +13,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    openstack.org/operator-name: watcher