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 0ba48797af..56c1ebd4ea 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 @@ -175,7 +175,7 @@ public static Matcher.Result 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 495fe98416..dc06a29c7e 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 @@ -60,7 +60,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(); @@ -76,11 +76,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(); } @@ -133,7 +132,7 @@ void ignoresWholeSubPath() { @Test void matchesMetadata() { - actual = + desired = new DeploymentBuilder(createDeployment()) .editOrNewMetadata() .addToAnnotations("test", "value") @@ -158,9 +157,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) @@ -170,9 +170,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();