fix(app): use jsonpatch to check for changes in status field (argopro…

…j#15126)

Signed-off-by: Vlad Fratila <[email protected]>

controller/appcontroller.go

@@ -1620,9 +1620,10 @@ func (ctrl *ApplicationController) persistAppStatus(orig *appv1.Application, new
 		}
 		delete(newAnnotations, appv1.AnnotationKeyRefresh)
 	}
-	patch, modified, err := diff.CreateTwoWayMergePatch(
+
+	patch, modified, err := argodiff.jsonMergePatch(
 		&appv1.Application{ObjectMeta: metav1.ObjectMeta{Annotations: orig.GetAnnotations()}, Status: orig.Status},
-		&appv1.Application{ObjectMeta: metav1.ObjectMeta{Annotations: newAnnotations}, Status: *newStatus}, appv1.Application{})
+		&appv1.Application{ObjectMeta: metav1.ObjectMeta{Annotations: newAnnotations}, Status: *newStatus})
 	if err != nil {
 		logCtx.Errorf("Error constructing app status patch: %v", err)
 		return

util/argo/diff/diff.go

@@ -1,8 +1,10 @@
 package diff
 
 import (
+	"encoding/json"
 	"fmt"
 
+	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
 
 	k8smanagedfields "k8s.io/apimachinery/pkg/util/managedfields"
@@ -386,3 +388,18 @@ func safeDeepCopy(obj *unstructured.Unstructured) *unstructured.Unstructured {
 	}
 	return obj.DeepCopy()
 }
+
+// jsonMergePatch is a wrapper func to calculate the diff between two objects
+// instead of bytes.
+func jsonMergePatch(orig, new interface{}) ([]byte, bool, error) {
+	origBytes, err := json.Marshal(orig)
+	if err != nil {
+		return nil, false, err
+	}
+	newBytes, err := json.Marshal(new)
+	if err != nil {
+		return nil, false, err
+	}
+	patch, err := jsonpatch.CreateMergePatch(origBytes, newBytes)
+	return patch, string(patch) != "{}", err
+}