From 662f521cd5a5081224696d4100f8e8b2051a3725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Fri, 19 Apr 2024 16:17:12 +0200 Subject: [PATCH] docs: minor comment on impl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../updatermatcher/GenericResourceUpdaterMatcher.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/updatermatcher/GenericResourceUpdaterMatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/updatermatcher/GenericResourceUpdaterMatcher.java index 2a5bae03b9..43d0b2fedf 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/updatermatcher/GenericResourceUpdaterMatcher.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/updatermatcher/GenericResourceUpdaterMatcher.java @@ -30,6 +30,8 @@ public R updateResource(R actual, R desired, Context context) { Map actualMap = kubernetesSerialization.convertValue(actual, Map.class); Map desiredMap = kubernetesSerialization.convertValue(desired, Map.class); // replace all top level fields from actual with desired, but merge metadata separately + // note that this ensures that `resourceVersion` is present, therefore optimistic + // locking will happen on server side var metadata = actualMap.remove(METADATA); actualMap.replaceAll((k, v) -> desiredMap.get(k)); actualMap.putAll(desiredMap);