WIP: remove control-plane label

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

docs/draft/api-reference/network-policies.md

@@ -19,8 +19,8 @@ NetworkPolicy is implemented for both catalogd and operator-controller component
 
 Each component has a dedicated NetworkPolicy that applies to its respective pod through label selectors:
 
-* For catalogd: `control-plane=catalogd-controller-manager`
-* For operator-controller: `control-plane=operator-controller-controller-manager`
+* For catalogd: `app.kubernetes.io/name=catalogd`
+* For operator-controller: `app.kubernetes.io/name=operator-controller`
 
 ### Catalogd NetworkPolicy
 
@@ -78,10 +78,10 @@ If you encounter network connectivity issues after deploying OLMv1, consider the
 
 ```bash
 # Verify catalogd pod labels
-kubectl get pods -n olmv1-system --selector=control-plane=catalogd-controller-manager
+kubectl get pods -n olmv1-system --selector=apps.kubernetes.io/name=catalogd
 
 # Verify operator-controller pod labels
-kubectl get pods -n olmv1-system --selector=control-plane=operator-controller-controller-manager
+kubectl get pods -n olmv1-system --selector=apps.kubernetes.io/name=operator-controller
 
 # Compare with actual pod names
 kubectl get pods -n olmv1-system | grep -E 'catalogd|operator-controller'

docs/draft/howto/consuming-metrics.md

@@ -226,7 +226,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: operator-controller-controller-manager
+    apps.kubernetes.io/name: operator-controller
   name: controller-manager-metrics-monitor
   namespace: olmv1-system
 spec:
@@ -251,7 +251,7 @@ spec:
           key: tls.key
   selector:
     matchLabels:
-      control-plane: operator-controller-controller-manager
+      apps.kubernetes.io/name: operator-controller
 EOF
 ```
 
@@ -268,7 +268,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: catalogd-controller-manager
+    apps.kubernetes.io/name: catalogd
   name: catalogd-metrics-monitor
   namespace: olmv1-system
 spec:
@@ -298,4 +298,4 @@ EOF
 ```
 
 [prometheus-operator]: https://github.com/prometheus-operator/kube-prometheus
-[rbac-k8s-docs]: https://kubernetes.io/docs/reference/access-authn-authz/rbac/
+[rbac-k8s-docs]: https://kubernetes.io/docs/reference/access-authn-authz/rbac/

docs/draft/howto/enable-helm-chart-support.md

@@ -24,7 +24,7 @@ To enable the Helm Chart support feature gate, you need to patch the `operator-c
 2.  **Wait for the controller manager pods to be ready:**
 
     ```bash
-    $ kubectl -n olmv1-system wait --for condition=ready pods -l control-plane=operator-controller-controller-manager
+    $ kubectl -n olmv1-system wait --for condition=ready pods -l apps.kubernetes.io/name=operator-controller
     ```
 
 Once the above wait condition is met, the `HelmChartSupport` feature gate should be enabled in operator controller.

docs/draft/howto/profiling_with_pprof.md

@@ -21,7 +21,7 @@ The following steps are examples to demonstrate the required changes to enable P
 1. Run the following command to patch the Deployment and add the `--pprof-bind-address=:8082` flag:
 
 ```shell
-kubectl patch deployment $(kubectl get deployments -n olmv1-system -l control-plane=operator-controller-controller-manager -o jsonpath='{.items[0].metadata.name}') \
+kubectl patch deployment $(kubectl get deployments -n olmv1-system -l apps.kubernetes.io/name=operator-controller -o jsonpath='{.items[0].metadata.name}') \
 -n olmv1-system --type='json' -p='[
   {
     "op": "add",
@@ -127,7 +127,7 @@ go tool pprof -http=:8080 ./operator-controller-profile.pprof
 1. Run the following command to patch the Deployment and add the `--pprof-bind-address=:8083` flag:
 
 ```shell
-kubectl patch deployment $(kubectl get deployments -n olmv1-system -l control-plane=catalogd-controller-manager -o jsonpath='{.items[0].metadata.name}') \
+kubectl patch deployment $(kubectl get deployments -n olmv1-system -l apps.kubernetes.io/name=catalogd -o jsonpath='{.items[0].metadata.name}') \
 -n olmv1-system --type='json' -p='[
   {
     "op": "add",
@@ -235,7 +235,7 @@ go tool pprof -http=:8080 ./catalogd-profile.pprof
 1. Run the following command to bind to `--pprof-bind-address` the value `0` in order to disable the endpoint.
 
 ```shell
-kubectl patch deployment $(kubectl get deployments -n olmv1-system -l control-plane=operator-controller-controller-manager -o jsonpath='{.items[0].metadata.name}') \
+kubectl patch deployment $(kubectl get deployments -n olmv1-system -l apps.kubernetes.io/name=operator-controller -o jsonpath='{.items[0].metadata.name}') \
 -n olmv1-system --type='json' -p='[
   {
     "op": "replace",
@@ -266,7 +266,7 @@ kubectl delete pod curl-oper-con-pprof -n olmv1-system
 
 1. Run the following command to bind to `--pprof-bind-address` the value `0` in order to disable the endpoint.
 ```shell
-kubectl patch deployment $(kubectl get deployments -n olmv1-system -l control-plane=catalogd-controller-manager -o jsonpath='{.items[0].metadata.name}') \
+kubectl patch deployment $(kubectl get deployments -n olmv1-system -l apps.kubernetes.io/name=catalogd -o jsonpath='{.items[0].metadata.name}') \
 -n olmv1-system --type='json' -p='[
   {
     "op": "replace",
@@ -294,4 +294,4 @@ re-start the deployment `kubectl rollout restart deployment -n olmv1-system cata
 kubectl delete pod curl-catalogd-pprof -n olmv1-system
 ```
 
-[pprof]: https://github.com/google/pprof/blob/main/doc/README.md
+[pprof]: https://github.com/google/pprof/blob/main/doc/README.md

helm/olmv1/templates/26-service-olmv1-system-catalogd-service.yml

@@ -8,7 +8,6 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   labels:
-    control-plane: catalogd-controller-manager
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-service
@@ -28,5 +27,5 @@ spec:
       protocol: TCP
       targetPort: 7443
   selector:
-    control-plane: catalogd-controller-manager
+    app.kubernetes.io/name: catalogd
 {{- end }}

helm/olmv1/templates/27-service-olmv1-system-operator-controller-service.yml

@@ -8,7 +8,6 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   labels:
-    control-plane: operator-controller-controller-manager
     app.kubernetes.io/name: operator-controller
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-service
@@ -20,5 +19,5 @@ spec:
       protocol: TCP
       targetPort: 8443
   selector:
-    control-plane: operator-controller-controller-manager
+    app.kubernetes.io/name: operator-controller
 {{- end }}

helm/olmv1/templates/29-deployment-olmv1-system-catalogd-controller-manager.yml

@@ -6,7 +6,6 @@ metadata:
     kubectl.kubernetes.io/default-logs-container: manager
     {{- include "olmv1.annotations" . | nindent 4 }}
   labels:
-    control-plane: catalogd-controller-manager
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-controller-manager
@@ -16,7 +15,7 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      control-plane: catalogd-controller-manager
+      app.kubernetes.io/name: catalogd
   template:
     metadata:
       annotations:
@@ -26,7 +25,6 @@ spec:
         {{- toYamlPretty . | nindent 8 }}
         {{- end }}
       labels:
-        control-plane: catalogd-controller-manager
         app.kubernetes.io/name: catalogd
         {{- include "olmv1.labels" . | nindent 8 }}
         {{- with .Values.components.catalogd.deployment.podLabels }}

helm/olmv1/templates/30-deployment-olmv1-system-operator-controller-controller-manager.yml

@@ -6,7 +6,6 @@ metadata:
     kubectl.kubernetes.io/default-logs-container: manager
     {{- include "olmv1.annotations" . | nindent 4 }}
   labels:
-    control-plane: operator-controller-controller-manager
     app.kubernetes.io/name: operator-controller
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-controller-manager
@@ -15,7 +14,7 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      control-plane: operator-controller-controller-manager
+      app.kubernetes.io/name: operator-controller
   template:
     metadata:
       annotations:
@@ -25,7 +24,6 @@ spec:
         {{- toYamlPretty . | nindent 8 }}
         {{- end }}
       labels:
-        control-plane: operator-controller-controller-manager
         app.kubernetes.io/name: operator-controller
         {{- include "olmv1.labels" . | nindent 8 }}
         {{- with .Values.components.operatorController.deployment.podLabels }}

helm/olmv1/templates/36-networkpolicy-olmv1-system-catalogd-controller-manager.yml

@@ -22,7 +22,7 @@ spec:
           protocol: TCP
   podSelector:
     matchLabels:
-      control-plane: catalogd-controller-manager
+      app.kubernetes.io/name: catalogd
   policyTypes:
     - Ingress
     - Egress

helm/olmv1/templates/38-networkpolicy-olmv1-system-operator-controller-controller-manager.yml

@@ -18,7 +18,7 @@ spec:
           protocol: TCP
   podSelector:
     matchLabels:
-      control-plane: operator-controller-controller-manager
+      app.kubernetes.io/name: operator-controller
   policyTypes:
     - Ingress
     - Egress