Application target state

application/comparator.go

@@ -2,6 +2,7 @@ package application
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"path"
 	"time"
@@ -62,17 +63,23 @@ func (ks *KsonnetAppComparator) CompareAppState(appRepoPath string, app *v1alpha
 	if err != nil {
 		return nil, err
 	}
-	asciiDiffs := make([]string, len(diffResults.Diffs))
 	deltaDiffs := make([]string, len(diffResults.Diffs))
 	for i, diffRes := range diffResults.Diffs {
-		asciiDiffs[i] = diffRes.ASCIIDiff
 		deltaDiffs[i] = diffRes.DeltaDiff
 	}
+	targetState := make([]string, len(objs))
+	for i, obj := range objs {
+		str, err := json.Marshal(obj.Object)
+		if err != nil {
+			return nil, err
+		}
+		targetState[i] = string(str)
+	}
 	compResult := v1alpha1.ComparisonResult{
-		ComparedTo: app.Spec.Source,
-		ComparedAt: metav1.Time{Time: time.Now().UTC()},
-		ASCIIDiffs: asciiDiffs,
-		DeltaDiffs: deltaDiffs,
+		TargetState: targetState,
+		ComparedTo:  app.Spec.Source,
+		ComparedAt:  metav1.Time{Time: time.Now().UTC()},
+		DeltaDiffs:  deltaDiffs,
 	}
 	if diffResults.Modified {
 		if *diffResults.AdditionsOnly {

pkg/apis/application/v1alpha1/types.go

@@ -71,12 +71,12 @@ type ApplicationStatus struct {
 
 // ComparisonResult is a comparison result of application spec and deployed application.
 type ComparisonResult struct {
-	ComparedAt metav1.Time       `json:"comparedAt" protobuf:"bytes,1,opt,name=comparedAt"`
-	ComparedTo ApplicationSource `json:"comparedTo" protobuf:"bytes,2,opt,name=comparedTo"`
-	Status     ComparisonStatus  `json:"status" protobuf:"bytes,3,opt,name=status,casttype=ComparisonStatus"`
-	ASCIIDiffs []string          `json:"asciiDiffs,omitempty" protobuf:"bytes,4,opt,name=asciiDiffs"`
-	DeltaDiffs []string          `json:"deltaDiffs,omitempty" protobuf:"bytes,5,opt,name=deltaDiffs"`
-	Error      string            `json:"error,omitempty" protobuf:"bytes,6,opt,name=error"`
+	ComparedAt  metav1.Time       `json:"comparedAt" protobuf:"bytes,1,opt,name=comparedAt"`
+	ComparedTo  ApplicationSource `json:"comparedTo" protobuf:"bytes,2,opt,name=comparedTo"`
+	Status      ComparisonStatus  `json:"status" protobuf:"bytes,3,opt,name=status,casttype=ComparisonStatus"`
+	TargetState []string          `json:"targetState,omitempty" protobuf:"bytes,4,opt,name=targetState"`
+	DeltaDiffs  []string          `json:"deltaDiffs,omitempty" protobuf:"bytes,5,opt,name=deltaDiffs"`
+	Error       string            `json:"error,omitempty" protobuf:"bytes,6,opt,name=error"`
 }
 
 // Cluster is the definition of a cluster resource

pkg/apis/application/v1alpha1/zz_generated.deepcopy.go

@@ -199,8 +199,8 @@ func (in *ComparisonResult) DeepCopyInto(out *ComparisonResult) {
 	*out = *in
 	in.ComparedAt.DeepCopyInto(&out.ComparedAt)
 	out.ComparedTo = in.ComparedTo
-	if in.ASCIIDiffs != nil {
-		in, out := &in.ASCIIDiffs, &out.ASCIIDiffs
+	if in.TargetState != nil {
+		in, out := &in.TargetState, &out.TargetState
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}