fix: Actually write errors and not only error count into status

e2e/gitops_errors_test.go

@@ -54,8 +54,8 @@ func (suite *GitopsTestSuite) assertErrors(key client.ObjectKey, rstatus metav1.
 	g.Expect(cr.Errors).To(ConsistOf(expectedErrors))
 	g.Expect(cr.Warnings).To(ConsistOf(expectedWarnings))
 
-	g.Expect(kd.Status.LastDeployResult.Errors).To(Equal(len(expectedErrors)))
-	g.Expect(kd.Status.LastDeployResult.Warnings).To(Equal(len(expectedWarnings)))
+	g.Expect(lastDeployResult.Errors).To(ConsistOf(expectedErrors))
+	g.Expect(lastDeployResult.Warnings).To(ConsistOf(expectedWarnings))
 }
 
 func (suite *GitopsTestSuite) TestGitOpsErrors() {

e2e/gitops_test.go

@@ -567,7 +567,9 @@ data:
 		if obj.Status.LastDeployResult == nil {
 			return false
 		}
-		return obj.Status.LastDeployResult.GitInfo.Commit == getHeadRevision(suite.T(), p)
+		ldr, err := obj.Status.GetLastDeployResult()
+		g.Expect(err).To(Succeed())
+		return ldr.GitInfo.Commit == getHeadRevision(suite.T(), p)
 	}, timeout, time.Second).Should(BeTrue())
 
 	suite.Run("cm1 and cm2 were not deleted", func() {

pkg/controllers/kluctl_project.go

@@ -820,6 +820,6 @@ func (pt *preparedTarget) exportCommandResultMetricsToProm(summary *result.Comma
 	internal_metrics.NewKluctlNumberOfDeletedObjects(pt.pp.obj.Namespace, pt.pp.obj.Name).Set(float64(summary.DeletedObjects))
 	internal_metrics.NewKluctlNumberOfChangedObjects(pt.pp.obj.Namespace, pt.pp.obj.Name).Set(float64(summary.ChangedObjects))
 	internal_metrics.NewKluctlNumberOfOrphanObjects(pt.pp.obj.Namespace, pt.pp.obj.Name).Set(float64(summary.OrphanObjects))
-	internal_metrics.NewKluctlNumberOfWarnings(pt.pp.obj.Namespace, pt.pp.obj.Name, summary.Command.Command).Set(float64(summary.Warnings))
-	internal_metrics.NewKluctlNumberOfErrors(pt.pp.obj.Namespace, pt.pp.obj.Name, summary.Command.Command).Set(float64(summary.Errors))
+	internal_metrics.NewKluctlNumberOfWarnings(pt.pp.obj.Namespace, pt.pp.obj.Name, summary.Command.Command).Set(float64(len(summary.Warnings)))
+	internal_metrics.NewKluctlNumberOfErrors(pt.pp.obj.Namespace, pt.pp.obj.Name, summary.Command.Command).Set(float64(len(summary.Errors)))
 }

pkg/controllers/kluctldeployment_controller.go

@@ -392,8 +392,8 @@ func (r *KluctlDeploymentReconciler) buildFinalStatus(ctx context.Context, obj *
 		}
 	}
 
-	deployOk := lastDeployResult != nil && lastDeployResult.Errors == 0
-	pruneOk := lastPruneResult != nil && lastPruneResult.Errors == 0
+	deployOk := lastDeployResult != nil && len(lastDeployResult.Errors) == 0
+	pruneOk := lastPruneResult != nil && len(lastPruneResult.Errors) == 0
 	validateOk := lastValidateResult != nil && len(lastValidateResult.Errors) == 0 && lastValidateResult.Ready
 
 	if !obj.Spec.Prune {

pkg/types/result/summary.go

@@ -23,8 +23,9 @@ type CommandResultSummary struct {
 	ChangedObjects int `json:"changedObjects"`
 	OrphanObjects  int `json:"orphanObjects"`
 	DeletedObjects int `json:"deletedObjects"`
-	Errors         int `json:"errors"`
-	Warnings       int `json:"warnings"`
+
+	Errors   []DeploymentError `json:"errors"`
+	Warnings []DeploymentError `json:"warnings"`
 
 	TotalChanges int `json:"totalChanges"`
 }
@@ -73,8 +74,8 @@ func (cr *CommandResult) BuildSummary() *CommandResultSummary {
 		ChangedObjects:     count(func(o ResultObject) bool { return len(o.Changes) != 0 }),
 		OrphanObjects:      count(func(o ResultObject) bool { return o.Orphan }),
 		DeletedObjects:     count(func(o ResultObject) bool { return o.Deleted }),
-		Errors:             len(cr.Errors),
-		Warnings:           len(cr.Warnings),
+		Errors:             cr.Errors,
+		Warnings:           cr.Warnings,
 	}
 	for _, o := range cr.Objects {
 		ret.TotalChanges += len(o.Changes)