wip

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/BoundedCache.java

@@ -2,7 +2,7 @@
 
 import java.util.Set;
 
-// todo: rename to cache?
+// todo: rename to cache? (replace the old one)
 public interface BoundedCache<K, R> {
 
   R get(K key);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/BoundedItemStore.java

@@ -5,13 +5,20 @@
 import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.informers.cache.Cache;
 import io.fabric8.kubernetes.client.informers.cache.ItemStore;
 
 public class BoundedItemStore<R extends HasMetadata> extends BoundedStore<String, R>
     implements ItemStore<R> {
 
   private final Function<R, String> keyFunction;
 
+  public BoundedItemStore(KubernetesClient client, Class<R> resourceClass,
+      BoundedCache<String, R> cache) {
+    this(new KubernetesResourceFetcher<>(resourceClass, client), cache, namespaceKeyFunc());
+  }
+
   public BoundedItemStore(KubernetesResourceFetcher<R> resourceFetcher,
       BoundedCache<String, R> cache, Function<R, String> keyFunction) {
     super(resourceFetcher, cache);
@@ -28,7 +35,9 @@ public Stream<String> keySet() {
     return super.keys();
   }
 
-  /** This is very inefficient but should not be called by the Informer or just */
+  /**
+   * This is very inefficient but should not be called by the Informer or just before it's started
+   */
   @Override
   public Stream<R> values() {
     var keys = cache.keys();
@@ -43,4 +52,8 @@ public Stream<R> values() {
   public int size() {
     return existingResources.size();
   }
+
+  public static <R extends HasMetadata> Function<R, String> namespaceKeyFunc() {
+    return r -> Cache.namespaceKeyFunc(r.getMetadata().getNamespace(), r.getMetadata().getName());
+  }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/KubernetesResourceFetcher.java

@@ -13,6 +13,10 @@ public class KubernetesResourceFetcher<R extends HasMetadata>
   private final KubernetesClient client;
   private final Function<String, ResourceID> resourceIDFunction;
 
+  public KubernetesResourceFetcher(Class<R> rClass, KubernetesClient client) {
+    this(rClass, client, inverseNamespaceKeyFunction());
+  }
+
   public KubernetesResourceFetcher(Class<R> rClass,
       KubernetesClient client,
       Function<String, ResourceID> resourceIDFunction) {
@@ -27,6 +31,20 @@ public R fetchResource(String key) {
     return resourceId.getNamespace().map(ns -> client.resources(rClass).inNamespace(ns)
         .withName(resourceId.getName()).get())
         .orElse(client.resources(rClass).withName(resourceId.getName()).get());
+  }
 
+  /**
+   * This would not be needed
+   **/
+  public static Function<String, ResourceID> inverseNamespaceKeyFunction() {
+    return s -> {
+      int delimiterIndex = s.indexOf("/");
+      if (delimiterIndex == -1) {
+        return new ResourceID(s);
+      } else {
+        return new ResourceID(s.substring(delimiterIndex + 1), s.substring(0, delimiterIndex));
+      }
+    };
   }
+
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/KubernetesResourceFetcherTest.java

@@ -0,0 +1,48 @@
+package io.javaoperatorsdk.operator.processing.event.source.cache;
+
+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.ObjectMetaBuilder;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class KubernetesResourceFetcherTest {
+
+  public static final String DEFAULT_NAMESPACE = "default";
+  public static final String TEST_RESOURCE_NAME = "test1";
+
+  @Test
+  void inverseKeyFunction() {
+    String key = BoundedItemStore.namespaceKeyFunc().apply(namespacedResource());
+    var resourceID = KubernetesResourceFetcher.inverseNamespaceKeyFunction().apply(key);
+
+    assertThat(resourceID.getNamespace()).isPresent().get().isEqualTo(DEFAULT_NAMESPACE);
+    assertThat(resourceID.getName()).isEqualTo(TEST_RESOURCE_NAME);
+
+    key = BoundedItemStore.namespaceKeyFunc().apply(clusterScopedResource());
+    resourceID = KubernetesResourceFetcher.inverseNamespaceKeyFunction().apply(key);
+
+    assertThat(resourceID.getNamespace()).isEmpty();
+    assertThat(resourceID.getName()).isEqualTo(TEST_RESOURCE_NAME);
+  }
+
+  private HasMetadata namespacedResource() {
+    var cm = new ConfigMap();
+    cm.setMetadata(new ObjectMetaBuilder()
+        .withName(TEST_RESOURCE_NAME)
+        .withNamespace(DEFAULT_NAMESPACE)
+        .build());
+    return cm;
+  }
+
+  private HasMetadata clusterScopedResource() {
+    var cm = new CustomResourceDefinition();
+    cm.setMetadata(new ObjectMetaBuilder()
+        .withName(TEST_RESOURCE_NAME)
+        .build());
+    return cm;
+  }
+}