WIP: fix control-plane label for deployments

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

Author: tmshort

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

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

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

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

manifests/experimental-e2e.yaml

@@ -1755,14 +1755,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: catalogd
+      control-plane: catalogd-controller-manager
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         olm.operatorframework.io/feature-set: experimental-e2e
       labels:
         app.kubernetes.io/name: catalogd
+        control-plane: catalogd-controller-manager
         app.kubernetes.io/part-of: olm
     spec:
       containers:
@@ -1895,14 +1896,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: operator-controller
+      control-plane: operator-controller-controller-manager
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         olm.operatorframework.io/feature-set: experimental-e2e
       labels:
         app.kubernetes.io/name: operator-controller
+        control-plane: operator-controller-controller-manager
         app.kubernetes.io/part-of: olm
     spec:
       containers:

manifests/experimental.yaml

@@ -1680,14 +1680,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: catalogd
+      control-plane: catalogd-controller-manager
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         olm.operatorframework.io/feature-set: experimental
       labels:
         app.kubernetes.io/name: catalogd
+        control-plane: catalogd-controller-manager
         app.kubernetes.io/part-of: olm
     spec:
       containers:
@@ -1812,14 +1813,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: operator-controller
+      control-plane: operator-controller-controller-manager
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         olm.operatorframework.io/feature-set: experimental
       labels:
         app.kubernetes.io/name: operator-controller
+        control-plane: operator-controller-controller-manager
         app.kubernetes.io/part-of: olm
     spec:
       containers:

manifests/standard-e2e.yaml

@@ -1755,14 +1755,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: catalogd
+      control-plane: catalogd-controller-manager
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         olm.operatorframework.io/feature-set: standard-e2e
       labels:
         app.kubernetes.io/name: catalogd
+        control-plane: catalogd-controller-manager
         app.kubernetes.io/part-of: olm
     spec:
       containers:
@@ -1894,14 +1895,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: operator-controller
+      control-plane: operator-controller-controller-manager
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         olm.operatorframework.io/feature-set: standard-e2e
       labels:
         app.kubernetes.io/name: operator-controller
+        control-plane: operator-controller-controller-manager
         app.kubernetes.io/part-of: olm
     spec:
       containers:

manifests/standard.yaml

@@ -1680,14 +1680,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: catalogd
+      control-plane: catalogd-controller-manager
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         olm.operatorframework.io/feature-set: standard
       labels:
         app.kubernetes.io/name: catalogd
+        control-plane: catalogd-controller-manager
         app.kubernetes.io/part-of: olm
     spec:
       containers:
@@ -1811,14 +1812,15 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: operator-controller
+      control-plane: operator-controller-controller-manager
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         olm.operatorframework.io/feature-set: standard
       labels:
         app.kubernetes.io/name: operator-controller
+        control-plane: operator-controller-controller-manager
         app.kubernetes.io/part-of: olm
     spec:
       containers: