Use v2 specific label to avoid matching previous deployment-based dis…

…patchers

This ensures that our `consumergroup` controller as well as replication
controller only match v2-specific pods and won't try to reconcile
pods that belong to the previous deployment.

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

control-plane/pkg/reconciler/consumergroup/consumergroup.go

@@ -766,7 +766,10 @@ func (r *Reconciler) reconcileSecret(ctx context.Context, expectedSecret *corev1
 }
 
 func (r *Reconciler) ensureContractConfigmapsExist(ctx context.Context, scheduler Scheduler) error {
-	selector := labels.SelectorFromSet(map[string]string{"app": scheduler.StatefulSetName})
+	selector := labels.SelectorFromSet(map[string]string{
+		"app":                    scheduler.StatefulSetName,
+		"app.kubernetes.io/kind": "kafka-dispatcher",
+	})
 	pods, err := r.PodLister.
 		Pods(r.SystemNamespace).
 		List(selector)

data-plane/config/broker/500-dispatcher.yaml

@@ -30,6 +30,7 @@ spec:
   selector:
     matchLabels:
       app: kafka-broker-dispatcher
+      app.kubernetes.io/kind: kafka-dispatcher
   template:
     metadata:
       name: kafka-broker-dispatcher

data-plane/config/channel/500-dispatcher.yaml

@@ -30,6 +30,7 @@ spec:
   selector:
     matchLabels:
       app: kafka-channel-dispatcher
+      app.kubernetes.io/kind: kafka-dispatcher
   template:
     metadata:
       name: kafka-channel-dispatcher

data-plane/config/source/500-dispatcher.yaml

@@ -30,6 +30,7 @@ spec:
   selector:
     matchLabels:
       app: kafka-source-dispatcher
+      app.kubernetes.io/kind: kafka-dispatcher
   template:
     metadata:
       name: kafka-source-dispatcher