Merge pull request #118 from phillebaba/feature/succeeded-event

Send event when reconcile succeeds with update metadata

Author: stefanprodan

controllers/kustomization_controller.go

@@ -97,7 +97,7 @@ func (r *KustomizationReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
 			// Our finalizer is still present, so lets handle garbage collection
 			if kustomization.Spec.Prune && !kustomization.Spec.Suspend {
 				if err := r.prune(kustomization, kustomization.Status.Snapshot, true); err != nil {
-					r.event(kustomization, kustomization.Status.LastAppliedRevision, recorder.EventSeverityError, "pruning for deleted resource failed")
+					r.event(kustomization, kustomization.Status.LastAppliedRevision, recorder.EventSeverityError, "pruning for deleted resource failed", map[string]string{})
 					// Return the error so we retry the failed garbage collection
 					return ctrl.Result{}, err
 				}
@@ -182,7 +182,7 @@ func (r *KustomizationReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
 			// instead we requeue on a fix interval.
 			msg := fmt.Sprintf("Dependencies do not meet ready condition, retrying in %s", r.requeueDependency.String())
 			log.Error(err, msg)
-			r.event(kustomization, source.GetArtifact().Revision, recorder.EventSeverityInfo, msg)
+			r.event(kustomization, source.GetArtifact().Revision, recorder.EventSeverityInfo, msg, map[string]string{})
 			return ctrl.Result{RequeueAfter: r.requeueDependency}, nil
 		}
 		log.Info("All dependencies area ready, proceeding with reconciliation")
@@ -192,7 +192,7 @@ func (r *KustomizationReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
 	reconciledKustomization, reconcileErr := r.reconcile(*kustomization.DeepCopy(), source)
 	if reconcileErr != nil {
 		// broadcast the error
-		r.event(kustomization, source.GetArtifact().Revision, recorder.EventSeverityError, reconcileErr.Error())
+		r.event(kustomization, source.GetArtifact().Revision, recorder.EventSeverityError, reconcileErr.Error(), map[string]string{})
 	}
 
 	// update status
@@ -213,6 +213,8 @@ func (r *KustomizationReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
 		// record the reconciliation error
 		return ctrl.Result{RequeueAfter: kustomization.Spec.Interval.Duration}, reconcileErr
 	}
+
+	r.event(reconciledKustomization, source.GetArtifact().Revision, recorder.EventSeverityInfo, "Update completed", map[string]string{"commit_status": "update"})
 	return ctrl.Result{RequeueAfter: kustomization.Spec.Interval.Duration}, nil
 }
 
@@ -573,15 +575,15 @@ func (r *KustomizationReconciler) applyWithRetry(kustomization kustomizev1.Kusto
 				return err
 			} else {
 				if changeSet != "" {
-					r.event(kustomization, revision, recorder.EventSeverityInfo, changeSet)
+					r.event(kustomization, revision, recorder.EventSeverityInfo, changeSet, map[string]string{})
 				}
 			}
 		} else {
 			return err
 		}
 	} else {
 		if changeSet != "" && kustomization.Status.LastAppliedRevision != revision {
-			r.event(kustomization, revision, recorder.EventSeverityInfo, changeSet)
+			r.event(kustomization, revision, recorder.EventSeverityInfo, changeSet, map[string]string{})
 		}
 	}
 	return nil
@@ -610,7 +612,7 @@ func (r *KustomizationReconciler) prune(kustomization kustomizev1.Kustomization,
 				strings.ToLower(kustomization.Kind),
 				fmt.Sprintf("%s/%s", kustomization.GetNamespace(), kustomization.GetName()),
 			).Info(fmt.Sprintf("garbage collection completed: %s", output))
-			r.event(kustomization, snapshot.Checksum, recorder.EventSeverityInfo, output)
+			r.event(kustomization, snapshot.Checksum, recorder.EventSeverityInfo, output, map[string]string{})
 		}
 	}
 	return nil
@@ -628,7 +630,7 @@ func (r *KustomizationReconciler) checkHealth(kustomization kustomizev1.Kustomiz
 	}
 
 	if kustomization.Status.LastAppliedRevision != revision {
-		r.event(kustomization, revision, recorder.EventSeverityInfo, "Health check passed")
+		r.event(kustomization, revision, recorder.EventSeverityInfo, "Health check passed", map[string]string{})
 	}
 	return nil
 }
@@ -686,7 +688,7 @@ func (r *KustomizationReconciler) checkDependencies(kustomization kustomizev1.Ku
 	return nil
 }
 
-func (r *KustomizationReconciler) event(kustomization kustomizev1.Kustomization, revision, severity, msg string) {
+func (r *KustomizationReconciler) event(kustomization kustomizev1.Kustomization, revision, severity, msg string, meta map[string]string) {
 	r.EventRecorder.Event(&kustomization, "Normal", severity, msg)
 	objRef, err := reference.GetReference(r.Scheme, &kustomization)
 	if err != nil {
@@ -698,9 +700,8 @@ func (r *KustomizationReconciler) event(kustomization kustomizev1.Kustomization,
 	}
 
 	if r.ExternalEventRecorder != nil {
-		var meta map[string]string
 		if revision != "" {
-			meta = map[string]string{"revision": revision}
+			meta["revision"] = revision
 		}
 
 		reason := severity