Emitting corev1 Events for debugging purposes

config/provisioners/in-memory-channel/in-memory-channel.yaml

@@ -97,12 +97,7 @@ rules:
     resources:
       - events
     verbs:
-      - get
-      - list
-      - watch
       - create
-      - update
-      - patch
 
 ---
 

hack/boilerplate/boilerplate.go.txt

@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Knative Authors
+Copyright 2019 The Knative Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

pkg/controller/eventing/inmemory/channel/reconcile.go

@@ -42,7 +42,6 @@ const (
 
 	// Name of the corev1.Events emitted from the reconciliation process
 	channelReconciled          = "ChannelReconciled"
-	channelReconcileFailed     = "ChannelReconcileFailed"
 	channelUpdateStatusFailed  = "ChannelUpdateStatusFailed"
 	channelConfigSyncFailed    = "ChannelConfigSyncFailed"
 	k8sServiceCreateFailed     = "K8sServiceCreateFailed"
@@ -99,7 +98,6 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err
 	err = r.reconcile(ctx, c)
 	if err != nil {
 		logger.Info("Error reconciling Channel", zap.Error(err))
-		r.recorder.Eventf(c, corev1.EventTypeWarning, channelReconcileFailed, "Failed to reconcile Channel: %v", err)
 		// Note that we do not return the error here, because we want to update the Status
 		// regardless of the error.
 	} else {
@@ -154,15 +152,15 @@ func (r *reconciler) reconcile(ctx context.Context, c *eventingv1alpha1.Channel)
 	svc, err := util.CreateK8sService(ctx, r.client, c)
 	if err != nil {
 		logger.Info("Error creating the Channel's K8s Service", zap.Error(err))
-		r.recorder.Eventf(c, corev1.EventTypeWarning, k8sServiceCreateFailed, "Failed to create Channel's K8s Service: %v", err)
+		r.recorder.Eventf(c, corev1.EventTypeWarning, k8sServiceCreateFailed, "Failed to reconcile Channel's K8s Service: %v", err)
 		return err
 	}
 	c.Status.SetAddress(controller.ServiceHostName(svc.Name, svc.Namespace))
 
 	_, err = util.CreateVirtualService(ctx, r.client, c, svc)
 	if err != nil {
 		logger.Info("Error creating the Virtual Service for the Channel", zap.Error(err))
-		r.recorder.Eventf(c, corev1.EventTypeWarning, virtualServiceCreateFailed, "Failed to create Virtual Service for the Channel: %v", err)
+		r.recorder.Eventf(c, corev1.EventTypeWarning, virtualServiceCreateFailed, "Failed to reconcile Virtual Service for the Channel: %v", err)
 		return err
 	}
 

pkg/controller/eventing/inmemory/channel/reconcile_test.go

@@ -180,7 +180,6 @@ var (
 
 	// map of events to set test cases' expectations easier
 	events = map[string]corev1.Event{
-		channelReconcileFailed:     {Reason: channelReconcileFailed, Type: corev1.EventTypeWarning},
 		channelReconciled:          {Reason: channelReconciled, Type: corev1.EventTypeNormal},
 		channelUpdateStatusFailed:  {Reason: channelUpdateStatusFailed, Type: corev1.EventTypeWarning},
 		channelConfigSyncFailed:    {Reason: channelConfigSyncFailed, Type: corev1.EventTypeWarning},
@@ -262,7 +261,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[channelConfigSyncFailed], events[channelReconcileFailed],
+				events[channelConfigSyncFailed],
 			},
 		},
 		{
@@ -287,7 +286,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[channelConfigSyncFailed], events[channelReconcileFailed],
+				events[channelConfigSyncFailed],
 			},
 		},
 		{
@@ -300,7 +299,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[channelConfigSyncFailed], events[channelReconcileFailed],
+				events[channelConfigSyncFailed],
 			},
 		},
 		{
@@ -313,7 +312,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[channelConfigSyncFailed], events[channelReconcileFailed],
+				events[channelConfigSyncFailed],
 			},
 		},
 		{
@@ -327,7 +326,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[channelConfigSyncFailed], events[channelReconcileFailed],
+				events[channelConfigSyncFailed],
 			},
 		},
 		{
@@ -344,7 +343,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[k8sServiceCreateFailed], events[channelReconcileFailed],
+				events[k8sServiceCreateFailed],
 			},
 		},
 		{
@@ -362,7 +361,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[k8sServiceCreateFailed], events[channelReconcileFailed],
+				events[k8sServiceCreateFailed],
 			},
 		},
 		{
@@ -383,7 +382,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[virtualServiceCreateFailed], events[channelReconcileFailed],
+				events[virtualServiceCreateFailed],
 			},
 		},
 		{
@@ -403,7 +402,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[virtualServiceCreateFailed], events[channelReconcileFailed],
+				events[virtualServiceCreateFailed],
 			},
 		},
 		{

pkg/controller/eventing/inmemory/clusterchannelprovisioner/reconcile.go

@@ -43,7 +43,6 @@ const (
 
 	// Name of the corev1.Events emitted from the reconciliation process
 	ccpReconciled          = "CcpReconciled"
-	ccpReconcileFailed     = "CcpReconcileFailed"
 	ccpUpdateStatusFailed  = "CcpUpdateStatusFailed"
 	k8sServiceCreateFailed = "K8sServiceCreateFailed"
 	k8sServiceDeleteFailed = "K8sServiceDeleteFailed"
@@ -103,7 +102,6 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err
 	err = r.reconcile(ctx, ccp)
 	if err != nil {
 		logger.Info("Error reconciling ClusterChannelProvisioner", zap.Error(err))
-		r.recorder.Eventf(ccp, corev1.EventTypeWarning, ccpReconcileFailed, "Failed to reconcile ClusterChannelProvisioner: %v", err)
 		// Note that we do not return the error here, because we want to update the Status
 		// regardless of the error.
 	} else {
@@ -152,7 +150,7 @@ func (r *reconciler) reconcile(ctx context.Context, ccp *eventingv1alpha1.Cluste
 
 	if err != nil {
 		logger.Info("Error creating the ClusterChannelProvisioner's K8s Service", zap.Error(err))
-		r.recorder.Eventf(ccp, corev1.EventTypeWarning, k8sServiceCreateFailed, "Failed to create ClusterChannelProvisioner's K8s Service: %v", err)
+		r.recorder.Eventf(ccp, corev1.EventTypeWarning, k8sServiceCreateFailed, "Failed to reconcile ClusterChannelProvisioner's K8s Service: %v", err)
 		return err
 	}
 

pkg/controller/eventing/inmemory/clusterchannelprovisioner/reconcile_test.go

@@ -54,7 +54,6 @@ var (
 	// map of events to set test cases' expectations easier
 	events = map[string]corev1.Event{
 		ccpReconciled:          {Reason: ccpReconciled, Type: corev1.EventTypeNormal},
-		ccpReconcileFailed:     {Reason: ccpReconcileFailed, Type: corev1.EventTypeWarning},
 		ccpUpdateStatusFailed:  {Reason: ccpUpdateStatusFailed, Type: corev1.EventTypeWarning},
 		k8sServiceCreateFailed: {Reason: k8sServiceCreateFailed, Type: corev1.EventTypeWarning},
 		k8sServiceDeleteFailed: {Reason: k8sServiceDeleteFailed, Type: corev1.EventTypeWarning},
@@ -180,7 +179,7 @@ func TestReconcile(t *testing.T) {
 			},
 			WantErrMsg: testErrorMessage,
 			WantEvent: []corev1.Event{
-				events[k8sServiceCreateFailed], events[ccpReconcileFailed],
+				events[k8sServiceCreateFailed],
 			},
 		},
 		{

pkg/controller/eventing/subscription/reconcile.go

@@ -45,10 +45,9 @@ const (
 
 	// Name of the corev1.Events emitted from the reconciliation process
 	subscriptionReconciled         = "SubscriptionReconciled"
-	subscriptionReconcileFailed    = "SubscriptionReconcileFailed"
 	subscriptionUpdateStatusFailed = "SubscriptionUpdateStatusFailed"
 	physicalChannelSyncFailed      = "PhysicalChannelSyncFailed"
-	objectReferenceFetchFailed     = "ObjectReferenceFetchFailed"
+	channelReferenceFetchFailed    = "ChannelReferenceFetchFailed"
 	subscriberResolveFailed        = "SubscriberResolveFailed"
 	resultResolveFailed            = "ResultResolveFailed"
 )
@@ -76,7 +75,6 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err
 	err = r.reconcile(subscription)
 	if err != nil {
 		glog.Warningf("Error reconciling Subscription: %v", err)
-		r.recorder.Eventf(subscription, corev1.EventTypeWarning, subscriptionReconcileFailed, "Failed to reconcile Subscription: %v", err)
 	} else {
 		glog.Info("Subscription reconciled")
 		r.recorder.Eventf(subscription, corev1.EventTypeNormal, subscriptionReconciled, "Subscription reconciled: %q", subscription.Name)
@@ -123,13 +121,13 @@ func (r *reconciler) reconcile(subscription *v1alpha1.Subscription) error {
 	_, err = r.fetchObjectReference(subscription.Namespace, &subscription.Spec.Channel)
 	if err != nil {
 		glog.Warningf("Failed to validate `channel` exists: %+v, %v", subscription.Spec.Channel, err)
-		r.recorder.Eventf(subscription, corev1.EventTypeWarning, objectReferenceFetchFailed, "Failed to validate Channel exists: %v", err)
+		r.recorder.Eventf(subscription, corev1.EventTypeWarning, channelReferenceFetchFailed, "Failed to validate spec.channel exists: %v", err)
 		return err
 	}
 
 	if subscriberURI, err := r.resolveSubscriberSpec(subscription.Namespace, subscription.Spec.Subscriber); err != nil {
 		glog.Warningf("Failed to resolve Subscriber %+v : %s", *subscription.Spec.Subscriber, err)
-		r.recorder.Eventf(subscription, corev1.EventTypeWarning, subscriberResolveFailed, "Failed to resolve Subscriber: %v", err)
+		r.recorder.Eventf(subscription, corev1.EventTypeWarning, subscriberResolveFailed, "Failed to resolve spec.subscriber: %v", err)
 		return err
 	} else {
 		subscription.Status.PhysicalSubscription.SubscriberURI = subscriberURI
@@ -138,7 +136,7 @@ func (r *reconciler) reconcile(subscription *v1alpha1.Subscription) error {
 
 	if replyURI, err := r.resolveResult(subscription.Namespace, subscription.Spec.Reply); err != nil {
 		glog.Warningf("Failed to resolve Result %v : %v", subscription.Spec.Reply, err)
-		r.recorder.Eventf(subscription, corev1.EventTypeWarning, resultResolveFailed, "Failed to resolve Result: %v", err)
+		r.recorder.Eventf(subscription, corev1.EventTypeWarning, resultResolveFailed, "Failed to resolve spec.reply: %v", err)
 		return err
 	} else {
 		subscription.Status.PhysicalSubscription.ReplyURI = replyURI