From e086d8eea9987dac10b7748380f195ae071299c6 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Sat, 18 Jul 2020 18:41:50 -0700 Subject: [PATCH] remove event emit for normal trigger reconcile --- pkg/reconciler/mtbroker/broker.go | 2 -- pkg/reconciler/mtbroker/broker_test.go | 32 -------------------------- 2 files changed, 34 deletions(-) diff --git a/pkg/reconciler/mtbroker/broker.go b/pkg/reconciler/mtbroker/broker.go index 6ec0a8453e0..dc633ae0eaf 100644 --- a/pkg/reconciler/mtbroker/broker.go +++ b/pkg/reconciler/mtbroker/broker.go @@ -333,8 +333,6 @@ func (r *Reconciler) reconcileTriggers(ctx context.Context, b *eventingv1.Broker if tErr != nil { logging.FromContext(ctx).Errorw("Reconciling trigger failed:", zap.String("name", t.Name), zap.Error(err)) recorder.Eventf(trigger, corev1.EventTypeWarning, triggerReconcileFailed, "Trigger reconcile failed: %v", tErr) - } else { - recorder.Event(trigger, corev1.EventTypeNormal, triggerReconciled, "Trigger reconciled") } trigger.Status.ObservedGeneration = t.Generation if _, updateStatusErr := r.updateTriggerStatus(ctx, trigger); updateStatusErr != nil { diff --git a/pkg/reconciler/mtbroker/broker_test.go b/pkg/reconciler/mtbroker/broker_test.go index 593a2eb3bd5..2b744822996 100644 --- a/pkg/reconciler/mtbroker/broker_test.go +++ b/pkg/reconciler/mtbroker/broker_test.go @@ -509,7 +509,6 @@ func TestReconcile(t *testing.T) { }}, WantEvents: []string{ finalizerUpdatedEvent, - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), }, WantPatches: []clientgotesting.PatchActionImpl{ patchFinalizers(testNS, brokerName), @@ -631,9 +630,6 @@ func TestReconcile(t *testing.T) { WithInitTriggerConditions, WithTriggerSubscriberURI(subscriberURI)), }}, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), - }, }, { Name: "Trigger subscription create fails", Key: testKey, @@ -800,9 +796,6 @@ func TestReconcile(t *testing.T) { WantCreates: []runtime.Object{ makeFilterSubscription(), }, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), - }, }, { Name: "Trigger has subscriber ref exists", Key: testKey, @@ -813,9 +806,6 @@ func TestReconcile(t *testing.T) { WithTriggerSubscriberRef(subscriberGVK, subscriberName, testNS), WithInitTriggerConditions)}...), WantErr: false, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), - }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerName, testNS, brokerName, WithTriggerUID(triggerUID), @@ -843,9 +833,6 @@ func TestReconcile(t *testing.T) { WithInitTriggerConditions, )}...), WantErr: false, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), - }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerName, testNS, brokerName, WithTriggerUID(triggerUID), @@ -873,9 +860,6 @@ func TestReconcile(t *testing.T) { WithInitTriggerConditions, )}...), WantErr: false, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), - }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerName, testNS, brokerName, WithTriggerUID(triggerUID), @@ -925,9 +909,6 @@ func TestReconcile(t *testing.T) { WithInitTriggerConditions, )}...), WantErr: false, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), - }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerName, testNS, brokerName, WithTriggerUID(triggerUID), @@ -952,9 +933,6 @@ func TestReconcile(t *testing.T) { WithInitTriggerConditions, )}...), WantErr: false, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), - }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerName, testNS, brokerName, WithTriggerUID(triggerUID), @@ -1009,8 +987,6 @@ func TestReconcile(t *testing.T) { WithDependencyAnnotation(dependencyAnnotation), )}...), WantErr: false, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled")}, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerName, testNS, brokerName, WithTriggerUID(triggerUID), @@ -1038,8 +1014,6 @@ func TestReconcile(t *testing.T) { WithDependencyAnnotation(dependencyAnnotation), )}...), WantErr: false, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled")}, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerName, testNS, brokerName, WithTriggerUID(triggerUID), @@ -1068,8 +1042,6 @@ func TestReconcile(t *testing.T) { WithDependencyAnnotation(dependencyAnnotation), )}...), WantErr: false, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled")}, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerName, testNS, brokerName, WithTriggerUID(triggerUID), @@ -1097,9 +1069,6 @@ func TestReconcile(t *testing.T) { WithDependencyAnnotation(dependencyAnnotation), )}...), WantErr: false, - WantEvents: []string{ - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), - }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerName, testNS, brokerName, WithTriggerUID(triggerUID), @@ -1131,7 +1100,6 @@ func TestReconcile(t *testing.T) { WantErr: false, WantEvents: []string{ Eventf(corev1.EventTypeNormal, subscriptionDeleted, `Deprecated subscription removed: "%s/%s"`, testNS, makeReadySubscriptionDeprecatedName(triggerNameLong, triggerUIDLong).Name), - Eventf(corev1.EventTypeNormal, "TriggerReconciled", "Trigger reconciled"), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ Object: NewTrigger(triggerNameLong, testNS, brokerName,