improve: remove optimistic locking from update for SSA in dependent resources (#2008)

csviri · web-flow · commit 3fa3b97180d9 · 2023-08-14T09:16:23.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
@@ -148,7 +148,6 @@ public R update(R actual, R target, P primary, Context<P> context) {
     }
     R updatedResource;
     if (useSSA(context)) {
-      target.getMetadata().setResourceVersion(actual.getMetadata().getResourceVersion());
       updatedResource = prepare(target, primary, "Updating")
           .fieldManager(context.getControllerConfiguration().fieldManager())
           .forceConflicts().serverSideApply();

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,6 @@ public R update(R actual, R target, P primary, Context<P> context) {`
`148`	`148`	`}`
`149`	`149`	`R updatedResource;`
`150`	`150`	`if (useSSA(context)) {`
`151`		`- target.getMetadata().setResourceVersion(actual.getMetadata().getResourceVersion());`
`152`	`151`	`updatedResource = prepare(target, primary, "Updating")`
`153`	`152`	`.fieldManager(context.getControllerConfiguration().fieldManager())`
`154`	`153`	`.forceConflicts().serverSideApply();`