Update event actions

Author: vasac

controllers/coherence_controller.go

@@ -114,7 +114,7 @@ func (in *CoherenceReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 		}
 		// else... error reading the current deployment state from k8s.
 		msg := fmt.Sprintf("failed to find Coherence resource, %s", err.Error())
-		in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "", msg)
+		in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "GetResource", msg)
 		// returning an error will requeue the event so we will try again
 		wrappedErr := errorhandling.NewGetResourceError(request.Name, request.Namespace, err)
 		return reconcile.Result{}, wrappedErr
@@ -129,10 +129,10 @@ func (in *CoherenceReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 			// Run finalization logic.
 			// If the finalization logic fails, don't remove the finalizer so
 			// that we can retry during the next reconciliation.
-			in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeNormal, reconciler.EventReasonDeleted, "", "running finalizers")
+			in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeNormal, reconciler.EventReasonDeleted, "Finalize", "running finalizers")
 			if err := in.finalizerManager.FinalizeDeployment(ctx, deployment, in.MaybeFindStatefulSet); err != nil {
 				msg := fmt.Sprintf("failed to finalize Coherence resource, %s", err.Error())
-				in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonDeleted, "", msg)
+				in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "Finalize", msg)
 				log.Error(err, "Failed to remove finalizer")
 				return ctrl.Result{RequeueAfter: time.Minute}, nil
 			}
@@ -145,7 +145,7 @@ func (in *CoherenceReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 					return ctrl.Result{}, nil
 				}
 				msg := fmt.Sprintf("failed to remove finalizers from Coherence resource, %s", err.Error())
-				in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonDeleted, "", msg)
+				in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "RemoveFinalizer", msg)
 				wrappedErr := errorhandling.NewOperationError("remove_finalizer", err).
 					WithContext("resource", deployment.GetName()).
 					WithContext("namespace", deployment.GetNamespace())
@@ -179,9 +179,9 @@ func (in *CoherenceReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 			var msg string
 			if err != nil {
 				msg = fmt.Sprintf("failed to add finalizers to Coherence resource, %s", err.Error())
-				in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "", msg)
+				in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "AddFinalizer", msg)
 			} else {
-				in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeNormal, reconciler.EventReasonUpdated, "", "added finalizer")
+				in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeNormal, reconciler.EventReasonUpdated, "AddFinalizer", "added finalizer")
 			}
 			// we need to requeue as we have updated the Coherence resource
 			return ctrl.Result{RequeueAfter: time.Minute}, err
@@ -208,13 +208,13 @@ func (in *CoherenceReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 		patch.Spec.Replicas = &replicas
 		_, err = in.ThreeWayPatch(ctx, deployment.Name, deployment, deployment, patch)
 		if err != nil {
-			in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "",
+			in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "PatchReplicas",
 				fmt.Sprintf("failed to add default replicas to Coherence resource, %s", err.Error()))
 			return reconcile.Result{}, errors.Wrap(err, "failed to add default replicas to Coherence resource")
 		}
 		msg := "Added default replicas to Coherence resource, re-queuing request"
 		log.Info(msg, "Replicas", strconv.Itoa(int(replicas)))
-		in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeNormal, reconciler.EventReasonUpdated, "", msg)
+		in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeNormal, reconciler.EventReasonUpdated, "PatchReplicas", msg)
 		return reconcile.Result{}, err
 	}
 
@@ -230,7 +230,7 @@ func (in *CoherenceReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 		err = errorhandling.NewOperationError("obtain_state_store", err).
 			WithContext("resource", deployment.GetName()).
 			WithContext("namespace", deployment.GetNamespace())
-		in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "",
+		in.GetEventRecorder().Eventf(deployment, nil, coreV1.EventTypeWarning, reconciler.EventReasonFailed, "GetStateStore",
 			fmt.Sprintf("failed to obtain state store: %s", err.Error()))
 		return in.HandleErrAndRequeue(ctx, err, deployment, fmt.Sprintf(reconcileFailedMessage, request.Name, request.Namespace, err), in.Log)
 	}

controllers/finalizer/finalizer.go

@@ -76,7 +76,7 @@ func (fm *FinalizerManager) FinalizeDeployment(ctx context.Context, c *coh.Coher
 		if _, bypass := annotations["coherence.oracle.com/finalizer-bypass"]; bypass {
 			fm.Log.Info("Bypassing service suspension due to finalizer-bypass annotation",
 				"Namespace", c.Namespace, "Name", c.Name)
-			fm.EventRecorder.Eventf(c, nil, corev1.EventTypeNormal, "FinalizerBypassed", "",
+			fm.EventRecorder.Eventf(c, nil, corev1.EventTypeNormal, "FinalizerBypassed", "Finalize",
 				"Service suspension bypassed due to finalizer-bypass annotation")
 			return nil
 		}
@@ -129,7 +129,7 @@ func (fm *FinalizerManager) FinalizeDeployment(ctx context.Context, c *coh.Coher
 				if errorCount > 3 {
 					fm.Log.Info("Service suspension failed multiple times, allowing deletion to proceed",
 						"Namespace", c.Namespace, "Name", c.Name, "ErrorCount", errorCount)
-					fm.EventRecorder.Eventf(c, nil, corev1.EventTypeWarning, "ServiceSuspensionFailed", "",
+					fm.EventRecorder.Eventf(c, nil, corev1.EventTypeWarning, "ServiceSuspensionFailed", "SuspendServices",
 						"Service suspension failed multiple times, allowing deletion to proceed anyway")
 					return nil
 				}

controllers/reconciler/base_controller.go

@@ -471,7 +471,7 @@ func (in *CommonReconciler) HandleErrAndFinish(ctx context.Context, err error, d
 		}
 
 		// send a failure event
-		in.GetEventRecorder().Eventf(deployment, nil, corev1.EventTypeWarning, "Failed", "", msg+": "+err.Error(), "")
+		in.GetEventRecorder().Eventf(deployment, nil, corev1.EventTypeWarning, "Failed", "HandleError", msg+": "+err.Error(), "")
 	}
 
 	// Return the error as a permanent error so it won't be requeued

pkg/events/events.go

@@ -38,7 +38,7 @@ func NewOwnedEventRecorder(owner runtime.Object, recorder events2.EventRecorder)
 // The resulting event will be created in the same namespace as the reference object.
 func (in *OwnedEventRecorder) Event(eventType, reason, message string) {
 	if in != nil && in.owner != nil && in.recorder != nil {
-		in.recorder.Eventf(in.owner, nil, eventType, reason, "", message)
+		in.recorder.Eventf(in.owner, nil, eventType, reason, "Operator", message)
 	}
 }