controller: strip newlines from Helm error message

To prevent spurious newlines between the error message and the captured logs, as at times Helm ends error with one or multiple newlines. Signed-off-by: Hidde Beydals <[email protected]>
fluxcd · Sep 11, 2023 · 1aa7390 · 1aa7390
1 parent eb3a4b8
commit 1aa7390
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/internal/controller/helmrelease_controller.go b/internal/controller/helmrelease_controller.go
@@ -715,7 +715,7 @@ func (r *HelmReleaseReconciler) handleHelmActionResult(ctx context.Context,
 		err = fmt.Errorf("Helm %s failed: %w", action, err)
 		msg := err.Error()
 		if actionErr := (*runner.ActionError)(nil); errors.As(err, &actionErr) {
-			msg = msg + "\n\nLast Helm logs:\n\n" + actionErr.CapturedLogs
+			msg = strings.TrimSpace(msg) + "\n\nLast Helm logs:\n\n" + actionErr.CapturedLogs
 		}
 		newCondition := metav1.Condition{
 			Type:    condition,