fix IT

csviri · csviri · commit b107c9cf2815 · 2026-07-15T14:56:40.000+02:00
Signed-off-by: Attila Mészáros &lt;a_meszaros@apple.com&gt;
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/resourceoperations/SecondaryResourceOperationsReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/resourceoperations/SecondaryResourceOperationsReconciler.java
@@ -114,6 +114,7 @@ public UpdateControl<SecondaryResourceOperationsCustomResource> reconcile(
               Options.filterWithOptimisticLocking());
       case JSON_MERGE_PATCH -> {
         var desired = desiredConfigMap(resource, APPLIED_VALUE);
+        desired.getMetadata().setResourceVersion(actual.getMetadata().getResourceVersion());
         ops.jsonMergePatch(desired, configMapEventSource, Options.filterWithOptimisticLocking());
       }
       default -> throw new IllegalStateException("Unexpected operation: " + operation);

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ public UpdateControl<SecondaryResourceOperationsCustomResource> reconcile(`
`114`	`114`	`Options.filterWithOptimisticLocking());`
`115`	`115`	`case JSON_MERGE_PATCH -> {`
`116`	`116`	`var desired = desiredConfigMap(resource, APPLIED_VALUE);`
	`117`	`+ desired.getMetadata().setResourceVersion(actual.getMetadata().getResourceVersion());`
`117`	`118`	`ops.jsonMergePatch(desired, configMapEventSource, Options.filterWithOptimisticLocking());`
`118`	`119`	`}`
`119`	`120`	`default -> throw new IllegalStateException("Unexpected operation: " + operation);`