Merge branch 'main' into security-context

fluxcd · Jan 4, 2022 · b823a44 · b823a44
2 parents 160e6fb + e2b988a
commit b823a44
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/controllers/helmrelease_controller.go b/controllers/helmrelease_controller.go
@@ -737,22 +737,27 @@ func (r *HelmReleaseReconciler) requestsForHelmChartChange(o client.Object) []re
 
 // event emits a Kubernetes event and forwards the event to notification controller if configured.
 func (r *HelmReleaseReconciler) event(ctx context.Context, hr v2.HelmRelease, revision, severity, msg string) {
-	r.EventRecorder.Event(&hr, "Normal", severity, msg)
+	if r.EventRecorder != nil {
+		r.EventRecorder.Event(&hr, "Normal", severity, msg)
+	}
+
+	if r.ExternalEventRecorder == nil {
+		return
+	}
+
 	objRef, err := reference.GetReference(r.Scheme, &hr)
 	if err != nil {
 		logr.FromContext(ctx).Error(err, "unable to send event")
 		return
 	}
 
-	if r.ExternalEventRecorder != nil {
-		var meta map[string]string
-		if revision != "" {
-			meta = map[string]string{"revision": revision}
-		}
-		if err := r.ExternalEventRecorder.Eventf(*objRef, meta, severity, severity, msg); err != nil {
-			logr.FromContext(ctx).Error(err, "unable to send event")
-			return
-		}
+	var meta map[string]string
+	if revision != "" {
+		meta = map[string]string{"revision": revision}
+	}
+	if err := r.ExternalEventRecorder.Eventf(*objRef, meta, severity, severity, msg); err != nil {
+		logr.FromContext(ctx).Error(err, "unable to send event")
+		return
 	}
 }