Revert BindingLabels & QueueLabels changes

There is already too much stuff happening in this PR. Thank you @benmoss
for suggesting that we split it in
#513

Signed-off-by: Gerhard Lazu <[email protected]>

Author: gvmw

pkg/reconciler/trigger/resources/binding.go

@@ -25,6 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
 
+	"knative.dev/eventing/pkg/apis/eventing"
 	eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
 )
 
@@ -86,14 +87,14 @@ func NewBinding(ctx context.Context, args *BindingArgs) (*rabbitv1beta1.Binding,
 // BindingLabels generates the labels present on the Queue linking the Broker / Trigger to the
 // Binding.
 func BindingLabels(b *eventingv1.Broker, t *eventingv1.Trigger) map[string]string {
-	if t != nil {
+	if t == nil {
 		return map[string]string{
-			"eventing.knative.dev/broker":  b.Name,
-			"eventing.knative.dev/trigger": t.Name,
+			eventing.BrokerLabelKey: b.Name,
 		}
 	} else {
 		return map[string]string{
-			"eventing.knative.dev/broker": b.Name,
+			eventing.BrokerLabelKey: b.Name,
+			TriggerLabelKey:         t.Name,
 		}
 	}
 }

pkg/reconciler/trigger/resources/queue.go

@@ -24,9 +24,12 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
 
+	"knative.dev/eventing/pkg/apis/eventing"
 	eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
 )
 
+const TriggerLabelKey = "eventing.knative.dev/trigger"
+
 type QueueArgs struct {
 	Name                     string
 	Namespace                string
@@ -70,14 +73,14 @@ func NewQueue(ctx context.Context, args *QueueArgs) *rabbitv1beta1.Queue {
 // QueueLabels generates the labels present on the Queue linking the Broker / Trigger to the
 // Queue.
 func QueueLabels(b *eventingv1.Broker, t *eventingv1.Trigger) map[string]string {
-	if t != nil {
+	if t == nil {
 		return map[string]string{
-			"eventing.knative.dev/broker":  b.Name,
-			"eventing.knative.dev/trigger": t.Name,
+			eventing.BrokerLabelKey: b.Name,
 		}
 	} else {
 		return map[string]string{
-			"eventing.knative.dev/broker": b.Name,
+			eventing.BrokerLabelKey: b.Name,
+			TriggerLabelKey:         t.Name,
 		}
 	}
 }