Use uniquely identifying labels selector for the operator deployment

config/default/kustomization.yaml

@@ -9,8 +9,9 @@ namespace: openshift-operators
 namePrefix: codeflare-operator-
 
 # Labels to add to all resources and selectors.
-# commonLabels:
-#  someName: someValue
+commonLabels:
+  app.kubernetes.io/name: codeflare-operator
+  app.kubernetes.io/part-of: codeflare
 
 bases:
 - ../crd

config/default/manager_auth_proxy_patch.yaml

@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
 spec:
   template:

config/default/manager_config_patch.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
 spec:
   template:

config/manager/manager.yaml

@@ -1,28 +1,26 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  labels:
-    control-plane: controller-manager
   name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: manager
   namespace: system
-  labels:
-    control-plane: controller-manager
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      app.kubernetes.io/name: codeflare-operator
+      app.kubernetes.io/part-of: codeflare
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        app.kubernetes.io/name: codeflare-operator
+        app.kubernetes.io/part-of: codeflare
     spec:
       securityContext:
         runAsNonRoot: true

config/prometheus/monitor.yaml

@@ -2,9 +2,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  labels:
-    control-plane: controller-manager
-  name: controller-manager-metrics-monitor
+  name: manager-metrics
   namespace: system
 spec:
   endpoints:
@@ -16,4 +14,5 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      app.kubernetes.io/name: codeflare-operator
+      app.kubernetes.io/part-of: codeflare

config/rbac/auth_proxy_service.yaml

@@ -1,9 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    control-plane: controller-manager
-  name: controller-manager-metrics-service
+  name: manager-metrics
   namespace: system
 spec:
   ports:
@@ -12,4 +10,5 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    app.kubernetes.io/name: codeflare-operator
+    app.kubernetes.io/part-of: codeflare