fix: use update instead of replace in DR (#2006)

csviri · web-flow · commit 55bc16cc1916 · 2023-08-14T15:21:33.000+02:00
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
@@ -153,7 +153,7 @@ public R update(R actual, R target, P primary, Context<P> context) {
           .forceConflicts().serverSideApply();
     } else {
       var updatedActual = updaterMatcher.updateResource(actual, target, context);
-      updatedResource = prepare(updatedActual, primary, "Updating").replace();
+      updatedResource = prepare(updatedActual, primary, "Updating").update();
     }
     log.debug("Resource version after update: {}",
         updatedResource.getMetadata().getResourceVersion());

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public R update(R actual, R target, P primary, Context<P> context) {`
`153`	`153`	`.forceConflicts().serverSideApply();`
`154`	`154`	`} else {`
`155`	`155`	`var updatedActual = updaterMatcher.updateResource(actual, target, context);`
`156`		`- updatedResource = prepare(updatedActual, primary, "Updating").replace();`
	`156`	`+ updatedResource = prepare(updatedActual, primary, "Updating").update();`
`157`	`157`	`}`
`158`	`158`	`log.debug("Resource version after update: {}",`
`159`	`159`	`updatedResource.getMetadata().getResourceVersion());`