From c85d8917436a323d6198b7a8fd6c7ffd006fdbcd Mon Sep 17 00:00:00 2001
From: mz <goncalo.farias@gmail.com>
Date: Sun, 19 Oct 2025 12:43:07 +0100
Subject: [PATCH] fix: correct parameters order in
 GenericKubernetesResourceMatcher call to JsonDiff.asJson

---
 .../GenericKubernetesResourceMatcher.java     |  2 +-
 .../GenericKubernetesResourceMatcherTest.java | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
index f96c28d60a..99e0a4311b 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
@@ -160,7 +160,7 @@ public static <R extends HasMetadata, P extends HasMetadata> Matcher.Result<R> m
     final var kubernetesSerialization = context.getClient().getKubernetesSerialization();
     var desiredNode = kubernetesSerialization.convertValue(desired, JsonNode.class);
     var actualNode = kubernetesSerialization.convertValue(actualResource, JsonNode.class);
-    var wholeDiffJsonPatch = JsonDiff.asJson(desiredNode, actualNode);
+    var wholeDiffJsonPatch = JsonDiff.asJson(actualNode, desiredNode);
 
     boolean matched = true;
     for (int i = 0; i < wholeDiffJsonPatch.size() && matched; i++) {
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java
index 3062e360e2..11ea0e9ec0 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java
@@ -45,7 +45,7 @@ void matchesTrivialCases() {
 
   @Test
   void matchesAdditiveOnlyChanges() {
-    actual.getSpec().getTemplate().getMetadata().getLabels().put("new-key", "val");
+    desired.getSpec().getTemplate().getMetadata().getLabels().put("new-key", "val");
     assertThat(GenericKubernetesResourceMatcher.match(desired, actual, context).matched())
         .withFailMessage("Additive changes should not cause a mismatch by default")
         .isTrue();
@@ -61,11 +61,10 @@ void matchesWithStrongSpecEquality() {
 
   @Test
   void doesNotMatchRemovedValues() {
-    actual = createDeployment();
-    assertThat(
-            GenericKubernetesResourceMatcher.match(
-                    dependentResource.desired(createPrimary("removed"), null), actual, context)
-                .matched())
+    desired = createDeployment();
+    actual = dependentResource.desired(createPrimary("removed"), null);
+
+    assertThat(GenericKubernetesResourceMatcher.match(desired, actual, context).matched())
         .withFailMessage("Removing values in metadata should lead to a mismatch")
         .isFalse();
   }
@@ -118,7 +117,7 @@ void ignoresWholeSubPath() {
 
   @Test
   void matchesMetadata() {
-    actual =
+    desired =
         new DeploymentBuilder(createDeployment())
             .editOrNewMetadata()
             .addToAnnotations("test", "value")
@@ -143,9 +142,10 @@ void matchesMetadata() {
   void checkServiceAccount() {
     final var serviceAccountDR = new ServiceAccountDR();
 
-    final var desired = serviceAccountDR.desired(null, context);
-    var actual =
-        new ServiceAccountBuilder(desired).addNewImagePullSecret("imagePullSecret3").build();
+    var actual = serviceAccountDR.desired(null, context);
+
+    final var desired =
+        new ServiceAccountBuilder(actual).addNewImagePullSecret("imagePullSecret3").build();
 
     assertThat(
             GenericKubernetesResourceMatcher.match(desired, actual, false, false, context)
@@ -155,9 +155,9 @@ void checkServiceAccount() {
 
   @Test
   void matchConfigMap() {
-    var desired = createConfigMap();
     var actual = createConfigMap();
-    actual.getData().put("key2", "val2");
+    var desired = createConfigMap();
+    desired.getData().put("key2", "val2");
 
     var match = GenericKubernetesResourceMatcher.match(desired, actual, true, false, context);
     assertThat(match.matched()).isTrue();