matching improvements

Author: csviri

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java

@@ -67,11 +67,6 @@ public boolean matches(R actual, R desired, Context<?> context) {
         managedFieldsEntry.getFieldsV1().getAdditionalProperties(), objectMapper);
     removeIrrelevantValues(desiredMap);
 
-    // this is kind strange fix for:
-    // https://kubernetes.slack.com/archives/C0EG7JC6T/p1685706853248489
-    removeOwnerRefernces(desiredMap);
-    removeOwnerRefernces(prunedActual);
-
     log.trace("Pruned actual: \n {} \n desired: \n {} ", prunedActual, desiredMap);
 
     return prunedActual.equals(desiredMap);
@@ -101,6 +96,10 @@ private void removeIrrelevantValues(HashMap<String, Object> desiredMap) {
   private void pruneActualAccordingManagedFields(Map<String, Object> result,
       Map<String, Object> actualMap,
       Map<String, Object> managedFields, ObjectMapper objectMapper) {
+    if (managedFields.isEmpty()) {
+      result.putAll(actualMap);
+      return;
+    }
     for (Map.Entry<String, Object> entry : managedFields.entrySet()) {
       String key = entry.getKey();
       if (key.startsWith(F_PREFIX)) {
@@ -113,13 +112,23 @@ private void pruneActualAccordingManagedFields(Map<String, Object> result,
             var valueList = new ArrayList<>();
             result.put(targetKey, valueList);
             for (Map.Entry<String, Object> listEntry : managedEntrySet) {
+              var actualListEntry = selectListEntryBasedOnKey(listEntry.getKey().substring(2),
+                  (List<Map<String, Object>>) actualMap.get(targetKey), objectMapper);
+
+              if (listEntry.getValue() instanceof Map
+                  && ((Map<String, Object>) listEntry.getValue()).isEmpty()) {
+                var map = new HashMap<String, Object>();
+                valueList.add(map);
+                pruneActualAccordingManagedFields(map, actualListEntry,
+                    (Map<String, Object>) listEntry.getValue(), objectMapper);
+                continue;
+              }
+
               if (DOT_KEY.equals(listEntry.getKey())) {
                 continue;
               }
               var emptyResMapValue = new HashMap<String, Object>();
               valueList.add(emptyResMapValue);
-              var actualListEntry = selectListEntryBasedOnKey(listEntry.getKey().substring(2),
-                  (List<Map<String, Object>>) actualMap.get(targetKey), objectMapper);
               pruneActualAccordingManagedFields(emptyResMapValue, actualListEntry,
                   (Map<String, Object>) listEntry.getValue(), objectMapper);
             }

Diff for: operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcherTest.java

@@ -3,6 +3,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
@@ -17,7 +19,7 @@ class SSABasedGenericKubernetesResourceMatcherTest {
 
   Context<?> mockedContext = mock(Context.class);
 
-  SSABasedGenericKubernetesResourceMatcher<Deployment> matcher =
+  SSABasedGenericKubernetesResourceMatcher<HasMetadata> matcher =
       new SSABasedGenericKubernetesResourceMatcher<>();
 
   @BeforeEach
@@ -40,6 +42,16 @@ void checksIfAddsNotAddedByController() {
     assertThat(matcher.matches(actual, desired, mockedContext)).isTrue();
   }
 
+  @Test
+  void emptyListElementMatchesAllFields() {
+    var desiredConfigMap = loadResource("configmap.empty-owner-reference-desired.yaml",
+        ConfigMap.class);
+    var actualConfigMap = loadResource("configmap.empty-owner-reference.yaml",
+        ConfigMap.class);
+
+    assertThat(matcher.matches(actualConfigMap, desiredConfigMap, mockedContext)).isTrue();
+  }
+
   // todo test lists with more entries
 
   private <R> R loadResource(String fileName, Class<R> clazz) {

Diff for: operator-framework-core/src/test/resources/io/javaoperatorsdk/operator/processing/dependent/kubernetes/configmap.empty-owner-reference-desired.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test1
+  namespace: default
+  ownerReferences:
+    - apiVersion: v1
+      kind: ConfigMap
+      name: kube-root-ca.crt
+      uid: 1ef74cb4-dbbd-45ef-9caf-aa76186594ea
+data:
+  key1: "val1"
+
+

Diff for: operator-framework-core/src/test/resources/io/javaoperatorsdk/operator/processing/dependent/kubernetes/configmap.empty-owner-reference.yaml

@@ -0,0 +1,27 @@
+apiVersion: v1
+data:
+  key1: "val1"
+kind: ConfigMap
+metadata:
+  creationTimestamp: "2023-06-07T11:08:34Z"
+  managedFields:
+    - apiVersion: v1
+      fieldsType: FieldsV1
+      fieldsV1:
+        f:data:
+          f:key1: {}
+        f:metadata:
+          f:ownerReferences:
+            k:{"uid":"1ef74cb4-dbbd-45ef-9caf-aa76186594ea"}: {}
+      manager: controller
+      operation: Apply
+      time: "2023-06-07T11:08:34Z"
+  name: test1
+  namespace: default
+  ownerReferences:
+    - apiVersion: v1
+      kind: ConfigMap
+      name: kube-root-ca.crt
+      uid: 1ef74cb4-dbbd-45ef-9caf-aa76186594ea
+  resourceVersion: "400"
+  uid: 1d47f98f-ff1e-46d8-bbb5-6658ec488ae2